diff options
| author | joerg <joerg@pkgsrc.org> | 2007-06-17 17:05:08 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-06-17 17:05:08 +0000 |
| commit | 39ef0d82327ff2bbc2f3ec437f3bf12e08e2da2c (patch) | |
| tree | 140b45a57e71d2e623ee39ca80d9ebf3e9a11661 /devel | |
| parent | 89f783bfd6ead8a133d6e27e3137ee5260bd9e3d (diff) | |
| download | pkgsrc-39ef0d82327ff2bbc2f3ec437f3bf12e08e2da2c.tar.gz | |
Fix pcre-config to always output the rpath for ${prefix}/lib based
on COMPILER_RPATH_FLAG. Before it hard-wired Solaris and *BSD, now
it works everywhere. Bump revision.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pcre/Makefile | 9 | ||||
| -rw-r--r-- | devel/pcre/distinfo | 3 | ||||
| -rw-r--r-- | devel/pcre/patches/patch-aa | 21 |
3 files changed, 31 insertions, 2 deletions
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 18b085da53a..214e5b555af 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2007/06/08 18:39:24 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2007/06/17 17:05:08 joerg Exp $ DISTNAME= pcre-7.1 CATEGORIES= devel +PKGREVISION= 1 MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ EXTRACT_SUFX= .tar.bz2 @@ -17,6 +18,12 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-utf8 +SUBST_CLASSES+= rpath +SUBST_STAGE.rpath= pre-configure +SUBST_MESSAGE.rpath= Fixing rpath output in pcre-config +SUBST_FILES.rpath= pcre-config.in +SUBST_VARS.rpath= COMPILER_RPATH_FLAG + PKGCONFIG_OVERRIDE= libpcre.pc.in libpcrecpp.pc.in # needs a stacksize of 4mb, default is 2mb diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo index f5a5c9c5ed5..5ab3f028126 100644 --- a/devel/pcre/distinfo +++ b/devel/pcre/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.24 2007/05/03 12:27:55 wiz Exp $ +$NetBSD: distinfo,v 1.25 2007/06/17 17:05:08 joerg Exp $ SHA1 (pcre-7.1.tar.bz2) = 1bc54556368165e7ce5f59ac2a60aba7dec6365c RMD160 (pcre-7.1.tar.bz2) = 1df0f1e86435a7f77c694472bb23bc71433a60be Size (pcre-7.1.tar.bz2) = 729915 bytes +SHA1 (patch-aa) = 2bca13cdd4a398ae3dbf26f75fd94557cb076dbe diff --git a/devel/pcre/patches/patch-aa b/devel/pcre/patches/patch-aa new file mode 100644 index 00000000000..16a7efdf6b5 --- /dev/null +++ b/devel/pcre/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.12 2007/06/17 17:05:08 joerg Exp $ + +--- pcre-config.in.orig 2007-06-17 16:31:18.000000000 +0000 ++++ pcre-config.in +@@ -12,15 +12,7 @@ if test $# -eq 0; then + exit 1 + fi + +-libR= +-case `uname -s` in +- *SunOS*) +- libR=" -R@libdir@" +- ;; +- *BSD*) +- libR=" -Wl,-R@libdir@" +- ;; +-esac ++libR=" @COMPILER_RPATH_FLAG@@libdir@" + + while test $# -gt 0; do + case "$1" in |