[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-15-g9c9616e
Lifeng Sun
lifongsun at gmail.com
Thu Jun 14 14:25:41 UTC 2012
The following commit has been merged in the master branch:
commit 8ef0ac831ca76d185bedd3c0c66452e3a4c5d090
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Thu Jun 14 21:46:20 2012 +0800
Remove patch 72: rpath flag is useless after we support multiarch.
diff --git a/debian/patches/72-rpath-ldflag.patch b/debian/patches/72-rpath-ldflag.patch
deleted file mode 100644
index 28a0c82..0000000
--- a/debian/patches/72-rpath-ldflag.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config/root-config.in
-+++ b/config/root-config.in
-@@ -651,7 +651,7 @@
- ;;
- --ldflags)
- ### Output linker flags
-- out="$out $auxldflags"
-+ out="-Wl,-rpath,/usr/lib/root $out $auxldflags"
- ;;
- --libs)
- ### Output regular ROOT libraries. If the user said --glibs --libs,
diff --git a/debian/patches/series b/debian/patches/series
index 3d58460..1710fbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,6 +45,5 @@
67-generate-iosenum.h.patch
69-support-pythia8.patch
71-remove-root-plugin-proof-xproof.patch
-72-rpath-ldflag.patch
73-ruby-1.9.1.patch
74-kfreebsd.patch
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list