diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-03-08 14:12:33 +0100 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-03-08 14:12:33 +0100 |
commit | 3244ba1bcf5c196c922463b5020050092facecba (patch) | |
tree | 6cea1647fb75c45d0222f61c2772e57a41465d14 /package/x11r7/xlib_libXt | |
parent | 73f244d59483dd9dcddf29cb6c92d9bcdc6f7898 (diff) | |
parent | 3437f2bee3e2adf58eb690e9ff7c493e683d43fa (diff) |
Merge branch 'x11r75' of git://gitorious.org/takeme-buildroot/takeme-buildroot
Diffstat (limited to 'package/x11r7/xlib_libXt')
-rw-r--r-- | package/x11r7/xlib_libXt/Config.in | 2 | ||||
-rw-r--r-- | package/x11r7/xlib_libXt/xlib_libXt-1.0.6-cross-compile-fix.patch | 28 | ||||
-rw-r--r-- | package/x11r7/xlib_libXt/xlib_libXt.mk | 2 |
3 files changed, 2 insertions, 30 deletions
diff --git a/package/x11r7/xlib_libXt/Config.in b/package/x11r7/xlib_libXt/Config.in index f2d216150..0656aab34 100644 --- a/package/x11r7/xlib_libXt/Config.in +++ b/package/x11r7/xlib_libXt/Config.in @@ -7,5 +7,5 @@ config BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XCB_PROTO select BR2_PACKAGE_LIBXCB help - libXt 1.0.4 + libXt 1.0.7 X.Org Xt library diff --git a/package/x11r7/xlib_libXt/xlib_libXt-1.0.6-cross-compile-fix.patch b/package/x11r7/xlib_libXt/xlib_libXt-1.0.6-cross-compile-fix.patch deleted file mode 100644 index f02edcb6f..000000000 --- a/package/x11r7/xlib_libXt/xlib_libXt-1.0.6-cross-compile-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 043ab5f..cb00a41 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -48,6 +48,10 @@ if test x"$CC_FOR_BUILD" = x; then - fi - fi - AC_SUBST([CC_FOR_BUILD]) -+CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} -+AC_SUBST(CFLAGS_FOR_BUILD) -+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} -+AC_SUBST(LDFLAGS_FOR_BUILD) - - PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) - -diff --git a/util/Makefile.am b/util/Makefile.am -index 0d3ff01..37b78d2 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -5,6 +5,8 @@ noinst_PROGRAMS = makestrs - endif - - CC = @CC_FOR_BUILD@ -+CFLAGS = @CFLAGS_FOR_BUILD@ -+LDFLAGS = @LDFLAGS_FOR_BUILD@ - - EXTRA_DIST = \ - Shell.ht \ diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index 2fcf88916..e3e43e4f6 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.0.6 +XLIB_LIBXT_VERSION = 1.0.7 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_AUTORECONF = YES |