diff options
author | joerg <joerg@pkgsrc.org> | 2013-10-20 18:18:52 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-10-20 18:18:52 +0000 |
commit | e61e93d8ff1209a8b61fcf0c139e775a32f44dbc (patch) | |
tree | dae306f59e4acd7157ab1dc10ff482879cb64396 | |
parent | 097a4604548694f41847b7824ebc5c3d66aa977a (diff) | |
download | pkgsrc-e61e93d8ff1209a8b61fcf0c139e775a32f44dbc.tar.gz |
Fix rpath option to have -Wl prefix.
-rw-r--r-- | databases/postgresql-postgis/distinfo | 6 | ||||
-rw-r--r-- | databases/postgresql-postgis/patches/patch-configure | 4 | ||||
-rw-r--r-- | databases/postgresql-postgis/patches/patch-configure.ac | 4 | ||||
-rw-r--r-- | databases/rrdtool/distinfo | 3 | ||||
-rw-r--r-- | databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL | 17 |
5 files changed, 26 insertions, 8 deletions
diff --git a/databases/postgresql-postgis/distinfo b/databases/postgresql-postgis/distinfo index a39f30c21d1..40dbb4c51a8 100644 --- a/databases/postgresql-postgis/distinfo +++ b/databases/postgresql-postgis/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2012/03/14 16:41:10 fhajny Exp $ +$NetBSD: distinfo,v 1.9 2013/10/20 18:18:52 joerg Exp $ SHA1 (postgis-1.5.3.tar.gz) = e8c572e0258ba760a67b7f717bdc8321b9f6cd58 RMD160 (postgis-1.5.3.tar.gz) = e30275890b175cbe1d70d5899cbe45ec34ddbafb Size (postgis-1.5.3.tar.gz) = 3779956 bytes -SHA1 (patch-configure) = 5995e773b9f8ec20e710d6cb690e928856c2650e -SHA1 (patch-configure.ac) = 993358912b61670733602511d507e497c9677875 +SHA1 (patch-configure) = 02eb1f3774bdb75f6426e3af97e81a1991c41b4b +SHA1 (patch-configure.ac) = 84d5371513f235184c65b4e80aa67334ae8c2498 SHA1 (patch-doc_Makefile.in) = 98807010256cf42e4d179305febe2525efbb6cd1 SHA1 (patch-doc_html_image__src_Makefile.in) = 89e19e03dbb936d723d1e6748cd2bd77232bcf6d SHA1 (patch-postgis_Makefile.in) = db0e73dac0d4c88cd44fe33253c8b766c576b664 diff --git a/databases/postgresql-postgis/patches/patch-configure b/databases/postgresql-postgis/patches/patch-configure index 866595b0582..f4e98f2d11c 100644 --- a/databases/postgresql-postgis/patches/patch-configure +++ b/databases/postgresql-postgis/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.1 2011/12/31 17:14:16 gdt Exp $ +$NetBSD: patch-configure,v 1.2 2013/10/20 18:18:52 joerg Exp $ See configure.ac patch. @@ -10,7 +10,7 @@ See configure.ac patch. -PGSQL_FE_LDFLAGS=-L`$PGCONFIG --libdir`" -lpq" + -+PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` -R`$PGCONFIG --libdir` -lpq" ++PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` ${COMPILER_RPATH_FLAG}`$PGCONFIG --libdir` -lpq" PGSQL_FE_CPPFLAGS=-I`$PGCONFIG --includedir` diff --git a/databases/postgresql-postgis/patches/patch-configure.ac b/databases/postgresql-postgis/patches/patch-configure.ac index c7bb9f50ee3..e8aaba581e4 100644 --- a/databases/postgresql-postgis/patches/patch-configure.ac +++ b/databases/postgresql-postgis/patches/patch-configure.ac @@ -1,4 +1,4 @@ -$NetBSD: patch-configure.ac,v 1.1 2011/12/31 17:14:16 gdt Exp $ +$NetBSD: patch-configure.ac,v 1.2 2013/10/20 18:18:52 joerg Exp $ Upstream's configure hand-constructs LDFLAGS from using --libdir, and fails to address rpath. @@ -13,7 +13,7 @@ understanding better. dnl Extract the linker and include flags for the frontend (for programs that use libpq) -PGSQL_FE_LDFLAGS=-L`$PGCONFIG --libdir`" -lpq" -+PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` -R`$PGCONFIG --libdir` -lpq" ++PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` ${COMPILER_RPATH_FLAG}`$PGCONFIG --libdir` -lpq" PGSQL_FE_CPPFLAGS=-I`$PGCONFIG --includedir` AC_SUBST([PGSQL_FE_LDFLAGS]) diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo index 6444ff7bfc4..9db958ff98c 100644 --- a/databases/rrdtool/distinfo +++ b/databases/rrdtool/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.43 2012/02/03 15:43:44 drochner Exp $ +$NetBSD: distinfo,v 1.44 2013/10/20 18:18:52 joerg Exp $ SHA1 (rrdtool-1.4.7.tar.gz) = faab7df7696b69f85d6f89dd9708d7cf0c9a273b RMD160 (rrdtool-1.4.7.tar.gz) = 3a8c1c0f3fe0d76fb7da8b712cdd19d59d5171ba @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 81131a74c8e9b81edfaa4b6746d4ab8508e82ac2 SHA1 (patch-al) = abc25497a10d59b1ad2e3a263f818eef89985538 SHA1 (patch-am) = 6c0a0890b1e8e2c1a186e2015c0cf5acd719b686 SHA1 (patch-az) = 41e7f6aad5a54a0fa27744709af404b887b88602 +SHA1 (patch-bindings_perl-shared_Makefile.PL) = d767dca08217a909132646216679a5d1fad4b77c diff --git a/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL b/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL new file mode 100644 index 00000000000..feac653d693 --- /dev/null +++ b/databases/rrdtool/patches/patch-bindings_perl-shared_Makefile.PL @@ -0,0 +1,17 @@ +$NetBSD: patch-bindings_perl-shared_Makefile.PL,v 1.1 2013/10/20 18:18:52 joerg Exp $ + +--- bindings/perl-shared/Makefile.PL.orig 2013-10-16 20:05:57.000000000 +0000 ++++ bindings/perl-shared/Makefile.PL +@@ -30,9 +30,9 @@ if (($Config{'osname'} eq 'MSWin32' && $ + for ($^O){ + /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"}; + /hpux/ && do{ $R = "+b$rp"}; +- /solaris/ && do{ $R = "-R$rp"}; +- /bsd/ && do{ $R = "-R$rp"}; +- /aix/ && do{ $R = "-blibpath:$rp"}; ++ /solaris/ && do{ $R = "-Wl,-R$rp"}; ++ /bsd/ && do{ $R = "-Wl,-R$rp"}; ++ /aix/ && do{ $R = "-Wl,-blibpath:$rp"}; + } + } + |