p5-Devel-CheckLib: avoid -rpath on macOS. Bump PKGREVISION.diff -r1.31 -r1.32 pkgsrc/devel/p5-Devel-CheckLib/Makefile
(schmonz)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.31 2023/07/06 09:39:00 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.32 2024/04/25 17:56:30 schmonz Exp $ | |
2 | 2 | |||
3 | DISTNAME= Devel-CheckLib-1.16 | 3 | DISTNAME= Devel-CheckLib-1.16 | |
4 | PKGNAME= p5-${DISTNAME} | 4 | PKGNAME= p5-${DISTNAME} | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 3 | |
6 | CATEGORIES= devel perl5 | 6 | CATEGORIES= devel perl5 | |
7 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Devel/} | 7 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Devel/} | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://metacpan.org/release/Devel-CheckLib | 10 | HOMEPAGE= https://metacpan.org/release/Devel-CheckLib | |
11 | COMMENT= Perl extension to check that a library is available | 11 | COMMENT= Perl extension to check that a library is available | |
12 | LICENSE= ${PERL5_LICENSE} | 12 | LICENSE= ${PERL5_LICENSE} | |
13 | 13 | |||
14 | PREV_PKGPATH= devel/p5-Devel-Checklib | 14 | PREV_PKGPATH= devel/p5-Devel-Checklib | |
15 | 15 | |||
16 | DEPENDS+= p5-IO-CaptureOutput>=1.08.01:../../devel/p5-IO-CaptureOutput | 16 | DEPENDS+= p5-IO-CaptureOutput>=1.08.01:../../devel/p5-IO-CaptureOutput | |
17 | DEPENDS+= p5-Capture-Tiny>=0:../../devel/p5-Capture-Tiny | 17 | DEPENDS+= p5-Capture-Tiny>=0:../../devel/p5-Capture-Tiny | |
18 | 18 |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.19 2022/07/28 18:45:03 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.20 2024/04/25 17:56:30 schmonz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (Devel-CheckLib-1.16.tar.gz) = 10f259b22ffe5617f60db73ee4d99f06f793164840a0d2c72ce6af1b17c62cc3 | 3 | BLAKE2s (Devel-CheckLib-1.16.tar.gz) = 10f259b22ffe5617f60db73ee4d99f06f793164840a0d2c72ce6af1b17c62cc3 | |
4 | SHA512 (Devel-CheckLib-1.16.tar.gz) = 919da046cdd1f48e0ccd8a7734a98f3144c0005c8303b02b43aeedcd2cfc148c78f502f26a80ea2612279e2becf4948b408d8cbd4b7cc514519c5954ae4139cb | 4 | SHA512 (Devel-CheckLib-1.16.tar.gz) = 919da046cdd1f48e0ccd8a7734a98f3144c0005c8303b02b43aeedcd2cfc148c78f502f26a80ea2612279e2becf4948b408d8cbd4b7cc514519c5954ae4139cb | |
5 | Size (Devel-CheckLib-1.16.tar.gz) = 15863 bytes | 5 | Size (Devel-CheckLib-1.16.tar.gz) = 15863 bytes | |
6 | SHA1 (patch-lib_Devel_CheckLib.pm) = e13d36c7092aec36c923b7ba4887ff28e66c1111 | 6 | SHA1 (patch-lib_Devel_CheckLib.pm) = b5e9e74723a5b0879627570c2d779d266087a75f |
@@ -1,16 +1,25 @@ | @@ -1,16 +1,25 @@ | |||
1 | $NetBSD: patch-lib_Devel_CheckLib.pm,v 1.3 2022/07/28 18:45:03 schmonz Exp $ | 1 | $NetBSD: patch-lib_Devel_CheckLib.pm,v 1.4 2024/04/25 17:56:30 schmonz Exp $ | |
2 | 2 | |||
3 | Fix regression reported in https://github.com/mattn/p5-Devel-CheckLib/issues/23. | 3 | Fix regression reported in https://github.com/mattn/p5-Devel-CheckLib/issues/23. | |
4 | Keeps p5-Crypt-DH-GMP building on at least NetBSD. | 4 | Keeps p5-Crypt-DH-GMP building on at least NetBSD. | |
5 | macOS doesn't use -rpath and older linkers don't recognize it. | |||
5 | 6 | |||
6 | --- lib/Devel/CheckLib.pm.orig 2022-05-04 14:31:10.000000000 +0000 | 7 | --- lib/Devel/CheckLib.pm.orig 2022-05-04 14:31:10.000000000 +0000 | |
7 | +++ lib/Devel/CheckLib.pm | 8 | +++ lib/Devel/CheckLib.pm | |
8 | @@ -454,7 +454,7 @@ sub _findcc { | 9 | @@ -295,7 +295,6 @@ sub _compile_cmd { | |
10 | $cfile, | |||
11 | (!defined $lib ? () : ( | |||
12 | (map "-L$_", @$libpaths), | |||
13 | - ($^O eq 'darwin' ? (map { "-Wl,-rpath,$_" } @$libpaths) : ()), | |||
14 | "-l$lib", | |||
15 | )), | |||
16 | @$ld, | |||
17 | @@ -454,7 +453,7 @@ sub _findcc { | |||
9 | push @Config_ldflags, $config_val if ( $config_val =~ /\S/ ); | 18 | push @Config_ldflags, $config_val if ( $config_val =~ /\S/ ); | |
10 | } | 19 | } | |
11 | my @ccflags = grep { length } _parsewords($Config_ccflags||'', $user_ccflags||''); | 20 | my @ccflags = grep { length } _parsewords($Config_ccflags||'', $user_ccflags||''); | |
12 | - my @ldflags = grep { length && $_ !~ m/^-Wl/ } _parsewords(@Config_ldflags, $user_ldflags||''); | 21 | - my @ldflags = grep { length && $_ !~ m/^-Wl/ } _parsewords(@Config_ldflags, $user_ldflags||''); | |
13 | + my @ldflags = grep { length } _parsewords(@Config_ldflags, $user_ldflags||''); | 22 | + my @ldflags = grep { length } _parsewords(@Config_ldflags, $user_ldflags||''); | |
14 | my @paths = split(/$Config{path_sep}/, $ENV{PATH}); | 23 | my @paths = split(/$Config{path_sep}/, $ENV{PATH}); | |
15 | my @cc = _parsewords($Config{cc}); | 24 | my @cc = _parsewords($Config{cc}); | |
16 | if (check_compiler ($cc[0], $debug)) { | 25 | if (check_compiler ($cc[0], $debug)) { |