Renamed global definition of LDFLAGS to LINKER_FLAGS.

This works around a broken behavior of dpkg which would use those flags
unconditionally whenever invoking the linker, which is not wanted e.g.
when compiling the python bindings (Closes: #476022).

Also actually pass the linker flags to configure - this did not happen so
far because of a missing "\".

diff --git a/debian/changelog b/debian/changelog
index c02fb98a7751efd18f801da88e27490809f66eb5..01193cc97e6b5826da7c265dcb43cfe8e808b6a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+rrdtool (1.2.27-2) unstable; urgency=low
+
+  * Renamed global definition of LDFLAGS to LINKER_FLAGS in debian/rules to
+    work around a broken behavior of dpkg which would use those flags
+    unconditionally whenever invoking the linker, which is not wanted e.g.
+    when compiling the python bindings (Closes: #476022).
+  * Actually pass the linker flags to configure.
+
+ -- Sebastian Harl <sh@tokkee.org>  Wed, 16 Apr 2008 15:50:54 +0200
+
 rrdtool (1.2.27-1) unstable; urgency=low
 
   [ Bernd Zeimetz ]

diff --git a/debian/rules b/debian/rules
index 0e24d079305c57b51244a5e1cbd1dd1dc3e6162e..87d72eb3dd809b387e609ecac7553886821099e4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,8 @@ ifneq ($(DEB_HOST_GNU_TYPE), arm)
 endif
 endif
 
-LDFLAGS="-Wl,-z,defs"
+# work-around for a broken dpkg - do not rename this to LDFLAGS :-/
+LINKER_FLAGS=-Wl,-z,defs
 
 configure: config.status
 config.status: $(QUILT_STAMPFN)
@@ -74,7 +75,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
 
-       LDFLAGS="$(LDFLAGS)"
+       LDFLAGS="$(LINKER_FLAGS)" \
        CFLAGS="$(CFLAGS)" \
        RRDDOCDIR=/usr/share/doc/rrdtool \
          ./configure $(CONFFLAGS)