[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-28-g2ca593b

Lifeng Sun lifongsun at gmail.com
Tue Jun 19 12:50:38 UTC 2012


The following commit has been merged in the master branch:
commit 2ca593ba17dde01ed42dde0fc306d1c350ddcbdd
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jun 19 19:59:04 2012 +0800

    74-kfreebsd.patch: fix rpath lintian error, see #568744.

diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
index c6461aa..dfd248a 100644
--- a/debian/patches/74-kfreebsd.patch
+++ b/debian/patches/74-kfreebsd.patch
@@ -422,3 +422,14 @@
        if [ -z "$EXPLLNKCORE" ]; then
           EXPLLNKCORE=" -ldl"
        else
+--- a/core/pcre/Module.mk
++++ b/core/pcre/Module.mk
+@@ -8,7 +8,7 @@
+ 
+ ifneq ($(BUILTINPCRE), yes)
+ 
+-PCRELIBF     := $(shell pcre-config --libs)
++PCRELIBF     := $(shell pcre-config --libs | sed -e 's|-Wl,-R.* ||')
+ PCREINC      := $(shell pcre-config --cflags)
+ PCRELIB      := $(filter -l%,$(PCRELIBF))
+ PCRELDFLAGS  := $(filter-out -l%,$(PCRELIBF))

-- 
root-system: CERN's ROOT Data Analysis Framework



More information about the debian-science-commits mailing list