Explorar o código

revert some BSD fixes, not working on Linux host

Waldemar Brodkorb %!s(int64=13) %!d(string=hai) anos
pai
achega
8842514fc5

+ 7 - 7
package/glib/Makefile

@@ -44,15 +44,15 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 
 pre-configure:
 ifeq ($(OStype),Linux)
-       (cd ${WRKBUILD}; rm -rf config.{cache,status}; \
+	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
                ./configure --prefix=$(STAGING_HOST_DIR) \
                        --with-libiconv=gnu \
-       )
-       ${MAKE} -C ${WRKBUILD} V=1
-       $(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
-       $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
-       $(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin
-       ${MAKE} -C ${WRKBUILD} clean
+	)
+	${MAKE} -C ${WRKBUILD} V=1
+	$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
+	$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
+	$(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin
+	${MAKE} -C ${WRKBUILD} clean
 endif
 
 

+ 0 - 1
package/libXt/Makefile

@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV}))
 
-CFLAGS_FOR_BUILD+=      -I/usr/local/include
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 

+ 0 - 9
package/libXt/patches/patch-util_Makefile_in

@@ -9,12 +9,3 @@
  CWARNFLAGS = @CWARNFLAGS@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
-@@ -231,7 +231,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
--makestrs_CFLAGS = $(XT_CFLAGS)
-+makestrs_CFLAGS = $(CFLAGS_FOR_BUILD)
- makestrs_SOURCES = makestrs.c
- 
- # Man page