debian/changelog |    4 ++++
 debian/rules     |    7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 1f0be5cdfcbeafbc551c57ec8fe4372372f4ac86
Author: Loïc Minier <[email protected]>
Date:   Sat Apr 11 20:55:58 2009 +0200

    Drop -Wl,-Bsymbolic-functions from LDFLAGS; LP: #343574

diff --git a/debian/changelog b/debian/changelog
index a25bd2f..3bc340d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ libxt (1:1.0.5-4) UNRELEASED; urgency=low
     in the long description.
   * Add upstream URL to debian/copyright.
 
+  [ Loic Minier ]
+  * Drop -Wl,-Bsymbolic-functions from LDFLAGS as it conflicts with the Xt
+    inheritance mechanism; LP: #343574.
+
  -- Brice Goglin <[email protected]>  Fri, 13 Jun 2008 11:36:24 +0200
 
 libxt (1:1.0.5-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index ef89986..5567cdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,10 @@ else
        confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+# drop -Wl,-Bsymbolic-functions from LDFLAGS as it conflicts with the Xt
+# inheritance mechanism; LP: #343574
+LDFLAGS := $(LDFLAGS:-Wl,-Bsymbolic-functions=)
+
 CFLAGS +=  
-DXFILESEARCHPATHDEFAULT=\\\"/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S:/etc/X11/%L/%T/%N%C%S:/etc/X11/%l/%T/%N%C%S:/etc/X11/%T/%N%C%S:/etc/X11/%L/%T/%N%S:/etc/X11/%l/%T/%N%S:/etc/X11/%T/%N%S\\\"
 -include X11/XlibConf.h -D_REENTRANT
 
 build: patch build-stamp
@@ -42,7 +46,8 @@ build-stamp:
        ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
                     --infodir=\$${prefix}/share/info $(confflags) \
                                 --with-appdefaultdir=/etc/X11/app-defaults \
-                    CFLAGS="$(CFLAGS)" 
+                    CFLAGS="$(CFLAGS)" \
+                    LDFLAGS="$(LDFLAGS)"
        cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
 
        touch build-stamp


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to