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

Obey Arthur Liu arthur at milliways.fr
Tue Mar 30 16:35:14 UTC 2010


The following commit has been merged in the master branch:
commit 8f3e8f6636bcf8d84aab9013ce3667f896a881b7
Author: Obey Arthur Liu <arthur at milliways.fr>
Date:   Sun Mar 28 15:40:09 2010 +0200

    Correctly export Mono SHM variable

diff --git a/debian/rules b/debian/rules
index 64ccb0b..1e1be2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,8 @@ DEB_CONFIGURE_EXTRA_FLAGS = --with-layout=debian \
 		--with-readline --without-internal-zlib
 
 DEB_CONFIGURE_SCRIPT_ENV += \
-		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed"
+		LDFLAGS="-Wl,-z,defs -Wl,--no-undefined -Wl,--as-needed" \
+		MONO_DISABLE_SHM=1
 
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
 
@@ -29,9 +30,6 @@ DEB_DH_INSTALLINIT_ARGS += --noscripts
 #DEB_MAKE_INVOKE += -j
 #.NOTPARALLEL:
 
-# Fix rare FTBFS on some archs like s390
-MONO_DISABLE_SHM = 1
-
 clean::
 	debconf-updatepo
 

-- 
Git repository for pkg-virtuoso



More information about the Pkg-virtuoso-commits mailing list