Tue Feb 18 22:18:48 2014 UTC ()
Restrict the explicit -lgcc_s to Linux as the comment indicates where it
is aimed at.
(joerg)
diff -r1.17 -r1.18 pkgsrc/net/ntp4/distinfo
diff -r0 -r1.1 pkgsrc/net/ntp4/patches/patch-configure
diff -r0 -r1.1 pkgsrc/net/ntp4/patches/patch-sntp_configure
--- pkgsrc/net/ntp4/distinfo 2014/01/12 17:01:02 1.17
+++ pkgsrc/net/ntp4/distinfo 2014/02/18 22:18:48 1.18
| @@ -1,7 +1,9 @@ | | | @@ -1,7 +1,9 @@ |
| 1 | $NetBSD: distinfo,v 1.17 2014/01/12 17:01:02 spz Exp $ | | 1 | $NetBSD: distinfo,v 1.18 2014/02/18 22:18:48 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (ntp-dev-4.2.7p410.tar.gz) = d93719047fdd9e67287edaabb1653735ffaf28f3 | | 3 | SHA1 (ntp-dev-4.2.7p410.tar.gz) = d93719047fdd9e67287edaabb1653735ffaf28f3 |
| 4 | RMD160 (ntp-dev-4.2.7p410.tar.gz) = 309f7c6ba088b9c4ac0b2bd018ea3918fb837d4f | | 4 | RMD160 (ntp-dev-4.2.7p410.tar.gz) = 309f7c6ba088b9c4ac0b2bd018ea3918fb837d4f |
| 5 | Size (ntp-dev-4.2.7p410.tar.gz) = 6334536 bytes | | 5 | Size (ntp-dev-4.2.7p410.tar.gz) = 6334536 bytes |
| 6 | SHA1 (patch-aa) = b247569339d09a88f2e143e355033ce7635ffe92 | | 6 | SHA1 (patch-aa) = b247569339d09a88f2e143e355033ce7635ffe92 |
| | | 7 | SHA1 (patch-configure) = a244467f886a8fedfa7a84864898fa6d84e0a6a3 |
| | | 8 | SHA1 (patch-sntp_configure) = c0c3d8bc9a23f3ef3ecfc369298df71f0da55943 |
| 7 | SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575 | | 9 | SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575 |
$NetBSD: patch-configure,v 1.1 2014/02/18 22:18:48 joerg Exp $
--- configure.orig 2014-02-18 19:22:37.000000000 +0000
+++ configure
@@ -26457,8 +26457,8 @@ done
# because thread cancellation fails to load libgcc_s with dlopen().
# We have to pass this all as linker options to avoid argument
# reordering by libtool.
- case "$GCC$with_gnu_ld" in
- yesyes)
+ case "$GCC,$with_gnu_ld,$host_os" in
+ yes,yes,linux)
PTHREAD_LIBS="$LTHREAD_LIBS -Wl,--no-as-needed,-lgcc_s,--as-needed"
;;
esac
$NetBSD: patch-sntp_configure,v 1.1 2014/02/18 22:18:48 joerg Exp $
--- sntp/configure.orig 2014-02-18 19:31:21.000000000 +0000
+++ sntp/configure
@@ -14368,8 +14368,8 @@ done
# because thread cancellation fails to load libgcc_s with dlopen().
# We have to pass this all as linker options to avoid argument
# reordering by libtool.
- case "$GCC$with_gnu_ld" in
- yesyes)
+ case "$GCC,$with_gnu_ld,$host_os" in
+ yes,yes,linux)
PTHREAD_LIBS="$LTHREAD_LIBS -Wl,--no-as-needed,-lgcc_s,--as-needed"
;;
esac