p5-Net-LibIDN: Do not hardcode COMPILER_RPATH_FLAG in patch

This commit is contained in:
nia 2024-03-18 11:50:49 +00:00
parent 2c0db08868
commit 6f1568aff1
3 changed files with 10 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2023/07/06 09:41:09 wiz Exp $
# $NetBSD: Makefile,v 1.26 2024/03/18 11:50:49 nia Exp $
DISTNAME= Net-LibIDN-0.12
PKGNAME= p5-${DISTNAME}
@ -16,6 +16,11 @@ MAKE_PARAMS.makemaker+= --with-libidn-inc=${BUILDLINK_PREFIX.libidn}/include
PERL5_PACKLIST= auto/Net/LibIDN/.packlist
SUBST_CLASSES+= rpath
SUBST_STAGE.rpath= pre-configure
SUBST_FILES.rpath+= Makefile.PL
SUBST_VARS.rpath+= COMPILER_RPATH_FLAG
.include "../../devel/libidn/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"

View File

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.7 2021/10/26 11:06:21 nia Exp $
$NetBSD: distinfo,v 1.8 2024/03/18 11:50:49 nia Exp $
BLAKE2s (Net-LibIDN-0.12.tar.gz) = 6ff28a9d76c339acae2d47755df09a566492f9a71a8091477c25954719e0f481
SHA512 (Net-LibIDN-0.12.tar.gz) = 2c80d0e3d4635e225e8866a1ef6335e3b8642662101e89fde6529aa07acc1eaf8adbe20fadd1d44898651f9d67a3d00c11ff71a22a2aa3027e81643e700d79ee
Size (Net-LibIDN-0.12.tar.gz) = 14262 bytes
SHA1 (patch-aa) = 71f762435abb1ba5d772f2a15655cebe124bd9b7
SHA1 (patch-aa) = 87cf297fce059533cfe570b727b27f712a62af41

View File

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.4 2013/01/03 20:48:47 dholland Exp $
$NetBSD: patch-aa,v 1.5 2024/03/18 11:50:49 nia Exp $
Use both the LDFLAGS from Perl and the directory passed from the
pkgsrc makefile to find libidn.
@ -20,7 +20,7 @@ pkgsrc makefile to find libidn.
-
+ $Params{LIBS} = "";
+ $Params{LIBS} .= "-L$libdir " if ($libdir);
+ $Params{LIBS} .= "-Wl,-R$libdir " if ($libdir);
+ $Params{LIBS} .= "@COMPILER_RPATH_FLAG@$libdir " if ($libdir);
+ $Params{LIBS} .= $Config{ldflags};
+ $Params{LIBS} .= " -lidn";
+