diff options
author | he <he@pkgsrc.org> | 2015-06-24 11:43:42 +0000 |
---|---|---|
committer | he <he@pkgsrc.org> | 2015-06-24 11:43:42 +0000 |
commit | 2c71bf7d24a1e05b24f4e46e36961b760c769124 (patch) | |
tree | ede33bd0ccf07549a9f1161f3d4230e210ecd782 /lang | |
parent | acc9bc2228ec89acff222b8e70a6cbbfa02b9618 (diff) | |
download | pkgsrc-2c71bf7d24a1e05b24f4e46e36961b760c769124.tar.gz |
Remove reference to file no longer part of the perl distribution.
Add a Configure test to verify that including <fenv.h> doesn't produce
a build error, as it will in quite few cases on NetBSD on archs which
are not amd64, i386 or sparc in NetBSD 6.x. If the test build fails,
pretend we don't have fenv.h.
Validated that the result builds on NetBSD/evbarm 6.0 and NetBSD/i386 6.1.5.
Build fix, so no need to bump PKGREVISION.
OK by wiz@
Diffstat (limited to 'lang')
-rw-r--r-- | lang/perl5/Makefile | 5 | ||||
-rw-r--r-- | lang/perl5/distinfo | 4 | ||||
-rw-r--r-- | lang/perl5/patches/patch-ca | 25 |
3 files changed, 28 insertions, 6 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index ace61d99f46..85187c627f1 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.234 2015/06/05 12:25:30 sevan Exp $ +# $NetBSD: Makefile,v 1.235 2015/06/24 11:43:42 he Exp $ .include "license.mk" .include "Makefile.common" @@ -279,8 +279,7 @@ SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc -E'/" # SUBST_CLASSES+= dirmode SUBST_STAGE.dirmode= post-patch -SUBST_FILES.dirmode= installhtml install_lib.pl \ - dist/ExtUtils-Install/lib/ExtUtils/Install.pm +SUBST_FILES.dirmode= installhtml install_lib.pl SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d" post-extract: diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index e78d859a21f..7b029ccd446 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.128 2015/06/11 13:44:23 adam Exp $ +$NetBSD: distinfo,v 1.129 2015/06/24 11:43:42 he Exp $ SHA1 (perl-5.22.0.tar.bz2) = 400338c91c56420d98142cbfcb84d418cae2c98c RMD160 (perl-5.22.0.tar.bz2) = 16f3ac6c5d4d72e599222bcbf2591c3b2aa2f857 @@ -9,7 +9,7 @@ SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38 SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7 SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953 SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc -SHA1 (patch-ca) = 51ba28fe241d1f7893965e8c258c376ca1d47800 +SHA1 (patch-ca) = 5d9085d12042e4745cc0d56457b02169824fd85d SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7 diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca index ed5d7dd5793..987a3ff6975 100644 --- a/lang/perl5/patches/patch-ca +++ b/lang/perl5/patches/patch-ca @@ -1,7 +1,8 @@ -$NetBSD: patch-ca,v 1.23 2015/06/11 13:44:23 adam Exp $ +$NetBSD: patch-ca,v 1.24 2015/06/24 11:43:42 he Exp $ * Use "uname -r" to get OS version for *BSD. * Move $loclibpth to the end of $dlist, instead of the beginning. +* Detect systems which have <fenv.h> but where using it fails. * Several other changes. --- Configure.orig 2015-05-13 20:19:28.000000000 +0000 @@ -184,3 +185,25 @@ $NetBSD: patch-ca,v 1.23 2015/06/11 13:44:23 adam Exp $ echo "Oh! Smells like ANSI's been here." >&4 echo "We can catify or stringify, separately or together!" cpp_stuff=42 +@@ -22645,6 +22685,21 @@ eval $inhdr + set fenv.h i_fenv + eval $inhdr + ++: And really validate that it is OK to include it ++: On NetBSD 6.x non-amd64 non-i386 and non-sparc this fails ++cat > try.c <<EOCP ++#include <fenv.h> ++int main() { ++ printf("runs ok too\n"); ++ exit(0); ++} ++EOCP ++set try ++if ! eval $compile_ok; then ++ echo "<fenv.h> found to be unusable, disabling" >&4 ++ i_fenv=$undef ++fi ++ + : see if this is a fp.h system + set fp.h i_fp + eval $inhdr |