diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-19 17:44:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-19 17:44:42 +0100 |
| commit | 8842514fc5554356ce0268bb015771da99fef2d5 (patch) | |
| tree | b5a516876dbb69e545a89724ffa6a41e7f906df4 /package | |
| parent | 9f02979caebb6e900fe101a257d8e6c344a7a173 (diff) | |
revert some BSD fixes, not working on Linux host
Diffstat (limited to 'package')
| -rw-r--r-- | package/glib/Makefile | 14 | ||||
| -rw-r--r-- | package/libXt/Makefile | 1 | ||||
| -rw-r--r-- | package/libXt/patches/patch-util_Makefile_in | 9 |
3 files changed, 7 insertions, 17 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 6d40e48c5..02086f234 100644 --- a/package/glib/Makefile +++ b/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 diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 84d467951..87e593339 100644 --- a/package/libXt/Makefile +++ b/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 diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in index 856fa8e79..2ec3ddf38 100644 --- a/package/libXt/patches/patch-util_Makefile_in +++ b/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 |