[SCM] Git repository for pkg-virtuoso branch, master, updated. upstream/6.0.1.cvs20091210+dfsg2-179-g2e782dd

Obey Arthur Liu arthur at milliways.fr
Fri Apr 2 15:41:23 UTC 2010


The following commit has been merged in the master branch:
commit 2e782dd40dc528a6cfbb3cae96856e6c9860a130
Author: Obey Arthur Liu <arthur at milliways.fr>
Date:   Fri Apr 2 17:06:19 2010 +0200

    Fix FTBFS on alpha related to recent libtool change (closes: #574942)

diff --git a/debian/changelog b/debian/changelog
index 8a282b9..fefe361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 virtuoso-opensource (6.1.0+dfsg2-4) unstable; urgency=medium
 
   * Correctly fix FTBFS on s390 related to SHM (closes: #574014).
+  * Fix FTBFS on alpha due to recent binutils change (closes: 575942).
   * Fix missing-debian-source-format lintian warning.
 
   [Christian Perrier]
diff --git a/debian/rules b/debian/rules
index 1e1be2b..04e6197 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,12 @@ DEB_CONFIGURE_EXTRA_FLAGS = --with-layout=debian \
 		--program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
 		--with-readline --without-internal-zlib
 
+ifeq ($(DEB_BUILD_ARCH),alpha)
+		EXTRA_LDFLAGS += -Wl,--no-relax
+endif
+
 DEB_CONFIGURE_SCRIPT_ENV += \
-		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed" \
+		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed $(EXTRA_LDFLAGS)" \
 		MONO_DISABLE_SHM=1
 
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp

-- 
Git repository for pkg-virtuoso



More information about the Pkg-virtuoso-commits mailing list