diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
commit | 9f02979caebb6e900fe101a257d8e6c344a7a173 (patch) | |
tree | 350b808ae23e8abb4ff08d472b76104a89e1f35a /package/libXt | |
parent | afb9908771db100ee97bb933fcca850c4f49af5a (diff) | |
parent | ee3c54b1570b9dd8ea900a11d496ced1ad1ae356 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libXt')
-rw-r--r-- | package/libXt/Makefile | 1 | ||||
-rw-r--r-- | package/libXt/patches/patch-util_Makefile_in | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 87e593339..84d467951 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -21,6 +21,7 @@ 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 8b2d3079c..856fa8e79 100644 --- a/package/libXt/patches/patch-util_Makefile_in +++ b/package/libXt/patches/patch-util_Makefile_in @@ -1,5 +1,5 @@ --- libXt-1.0.9.orig/util/Makefile.in 2010-10-28 21:04:12.000000000 +0200 -+++ libXt-1.0.9/util/Makefile.in 2011-01-24 17:53:22.000000000 +0100 ++++ libXt-1.0.9/util/Makefile.in 2011-11-05 16:05:13.000000000 +0100 @@ -108,7 +108,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CHANGELOG_CMD = @CHANGELOG_CMD@ @@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE) -makestrs_CFLAGS = $(XT_CFLAGS) -+makestrs_CFLAGS = ++makestrs_CFLAGS = $(CFLAGS_FOR_BUILD) makestrs_SOURCES = makestrs.c # Man page |