diff options
| author | dholland <dholland> | 2013-01-03 20:48:47 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-01-03 20:48:47 +0000 |
| commit | 322626c2c4ccf6d73cef1e7b4319fcef67fb7edb (patch) | |
| tree | b48fd508ff9560cd47066f157d5f30d8069419a7 | |
| parent | bb871d3fcb5d20a0cf0e65376719bd8e4fc971ac (diff) | |
| download | pkgsrc-322626c2c4ccf6d73cef1e7b4319fcef67fb7edb.tar.gz | |
Insert rpath for BUILDLINK_PREFIX.libidn as well as using the one that
comes from Perl, so this will still build if libidn and Perl are
installed in different trees. Belt-and-suspenders fix for PR 47187 on
NetBSD, may also fix the problem seen on Dragonfly.
| -rw-r--r-- | net/p5-Net-LibIDN/distinfo | 4 | ||||
| -rw-r--r-- | net/p5-Net-LibIDN/patches/patch-aa | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/net/p5-Net-LibIDN/distinfo b/net/p5-Net-LibIDN/distinfo index a6a6d4df327..403fe7d868e 100644 --- a/net/p5-Net-LibIDN/distinfo +++ b/net/p5-Net-LibIDN/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2010/09/15 10:32:52 obache Exp $ +$NetBSD: distinfo,v 1.4 2013/01/03 20:48:47 dholland Exp $ SHA1 (Net-LibIDN-0.12.tar.gz) = ac446edf66ac523d5463b59ed9698e2ccb9b04ab RMD160 (Net-LibIDN-0.12.tar.gz) = a595c3758c9577b6d09d856cf220c303fdc3d2a2 Size (Net-LibIDN-0.12.tar.gz) = 14262 bytes -SHA1 (patch-aa) = 2aab1ead74de84b310b5bab02c32c4993ae5a11e +SHA1 (patch-aa) = 71f762435abb1ba5d772f2a15655cebe124bd9b7 diff --git a/net/p5-Net-LibIDN/patches/patch-aa b/net/p5-Net-LibIDN/patches/patch-aa index 5dd08085674..adc6bd161cb 100644 --- a/net/p5-Net-LibIDN/patches/patch-aa +++ b/net/p5-Net-LibIDN/patches/patch-aa @@ -1,8 +1,11 @@ -$NetBSD: patch-aa,v 1.3 2010/09/15 10:32:52 obache Exp $ +$NetBSD: patch-aa,v 1.4 2013/01/03 20:48:47 dholland Exp $ + +Use both the LDFLAGS from Perl and the directory passed from the +pkgsrc makefile to find libidn. --- Makefile.PL.orig 2009-02-26 12:09:45.000000000 +0000 -+++ Makefile.PL 2009-02-28 00:05:41.000000000 +0000 -@@ -47,15 +47,10 @@ ++++ Makefile.PL +@@ -47,15 +47,12 @@ sub InitMakeParams "disable-tld" => \$disable_tld ); @@ -15,8 +18,10 @@ $NetBSD: patch-aa,v 1.3 2010/09/15 10:32:52 obache Exp $ - $Params{LIBS} = $Config{ldflags} . ' -lidn'; - } - -+ $Params{LIBS} = $Config{ldflags}; -+ $Params{LIBS} .= " -L$libdir" if ($libdir); ++ $Params{LIBS} = ""; ++ $Params{LIBS} .= "-L$libdir " if ($libdir); ++ $Params{LIBS} .= "-Wl,-R$libdir " if ($libdir); ++ $Params{LIBS} .= $Config{ldflags}; + $Params{LIBS} .= " -lidn"; + if ($incdir) |