Backport upstream fix for pointersize test
The symbol 'main' is multiply defined because Perl 5's `Configure` script erroneously appends `try.c`, instead of overwriting it. This change backports an upstream patch, which will not be needed once Perl 5 5.23.x is available. Sent by Eric N. Vander Weele
This commit is contained in:
parent
f8696e8229
commit
7db612f19b
2 changed files with 18 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.132 2015/12/28 13:44:03 adam Exp $
|
||||
$NetBSD: distinfo,v 1.133 2016/03/07 21:27:58 kamil Exp $
|
||||
|
||||
SHA1 (perl-5.22.1.tar.bz2) = 29f9b320b0299577a3e1d02e9e8ef8f26f160332
|
||||
RMD160 (perl-5.22.1.tar.bz2) = 99e3af98d80ace857da6ce28679a2e35a4360144
|
||||
|
@ -10,7 +10,7 @@ SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
|
|||
SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
|
||||
SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953
|
||||
SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
|
||||
SHA1 (patch-ca) = 5d9085d12042e4745cc0d56457b02169824fd85d
|
||||
SHA1 (patch-ca) = 32ca5f5cc9264d3bbc5295c04b4062db2a0e1b4d
|
||||
SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
|
||||
SHA1 (patch-ck) = 483e93a782e5627d3c7334d930ee11010fe7f7d8
|
||||
SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
$NetBSD: patch-ca,v 1.24 2015/06/24 11:43:42 he Exp $
|
||||
$NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil 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
|
||||
--- Configure.orig 2015-10-17 12:38:37.000000000 +0000
|
||||
+++ Configure
|
||||
@@ -3439,13 +3439,14 @@ EOM
|
||||
osvers="$3"
|
||||
|
@ -114,6 +114,15 @@ $NetBSD: patch-ca,v 1.24 2015/06/24 11:43:42 he Exp $
|
|||
|
||||
: Determine list of previous versions to include in @INC
|
||||
$cat > getverlist <<EOPL
|
||||
@@ -7631,7 +7646,7 @@ echo " "
|
||||
case "$ptrsize" in
|
||||
'')
|
||||
echo "Checking to see how big your pointers are..." >&4
|
||||
- $cat >>try.c <<EOCP
|
||||
+ $cat >try.c <<EOCP
|
||||
#include <stdio.h>
|
||||
#$i_stdlib I_STDLIB
|
||||
#ifdef I_STDLIB
|
||||
@@ -7902,7 +7917,9 @@ case "$vendorprefix" in
|
||||
vendorlibexp="$ansexp"
|
||||
;;
|
||||
|
@ -207,3 +216,8 @@ $NetBSD: patch-ca,v 1.24 2015/06/24 11:43:42 he Exp $
|
|||
: see if this is a fp.h system
|
||||
set fp.h i_fp
|
||||
eval $inhdr
|
||||
@@ -24966,4 +25021,3 @@ $rm -f kit*isdone ark*isdone
|
||||
$rm -rf UU
|
||||
|
||||
: End of Configure
|
||||
-
|
||||
|
|
Loading…
Reference in a new issue