Skip to content

Commit 9c26484

Browse files
Tekkizakame
authored andcommitted
Update patch files for older versions.
1 parent d52144a commit 9c26484

File tree

40 files changed

+696
-212
lines changed

40 files changed

+696
-212
lines changed

5.008.009-main,threaded/DevelPatchPerl.patch

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ index 6f20c5e..684f369 100644
4040
or die "Cannot exec $cpp";
4141
}
4242
diff --git a/hints/linux.sh b/hints/linux.sh
43-
index ac264c3..3f38ea0 100644
43+
index ac264c3..a985a8e 100644
4444
--- a/hints/linux.sh
4545
+++ b/hints/linux.sh
4646
@@ -13,11 +13,14 @@
@@ -123,7 +123,7 @@ index ac264c3..3f38ea0 100644
123123
ppc*)
124124
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
125125
# with -O2 ; so downgrade to -O1.
126-
@@ -143,93 +150,78 @@ case "$optimize" in
126+
@@ -143,93 +150,88 @@ case "$optimize" in
127127
;;
128128
esac
129129

@@ -235,6 +235,17 @@ index ac264c3..3f38ea0 100644
235235
- ;;
236236
- esac
237237
-fi
238+
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
239+
+# available functions, like memem, won't be used. See the discussion in
240+
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
241+
+# at least on alpine linux, the ldd --version output contains the
242+
+# string 'musl.'
243+
+case `ldd --version 2>&1` in
244+
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
245+
+ *) ;;
246+
+esac
247+
248+
-rm -f try.c a.out
238249
+# libquadmath is sometimes installed as gcc internal library,
239250
+# so contrary to our usual policy of *not* looking at gcc internal
240251
+# directories we now *do* look at them, in case they contain
@@ -252,7 +263,7 @@ index ac264c3..3f38ea0 100644
252263
+ ;;
253264
+esac
254265

255-
-rm -f try.c a.out
266+
-if /bin/sh -c exit; then
256267
+case "$libc" in
257268
+'')
258269
+# If you have glibc, then report the version for ./myconfig bug reporting.
@@ -278,13 +289,12 @@ index ac264c3..3f38ea0 100644
278289
+ done
279290
+ ;;
280291
+esac
281-
282-
-if /bin/sh -c exit; then
292+
+
283293
+if ${sh:-/bin/sh} -c exit; then
284294
echo ''
285295
echo 'You appear to have a working bash. Good.'
286296
else
287-
@@ -296,7 +288,7 @@ fi
297+
@@ -296,7 +298,7 @@ fi
288298
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
289299
#esac
290300

@@ -293,7 +303,7 @@ index ac264c3..3f38ea0 100644
293303
sparc*)
294304
case "$cccdlflags" in
295305
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
296-
@@ -311,24 +303,62 @@ esac
306+
@@ -311,24 +313,62 @@ esac
297307
# version of -lgdbm which is a bad idea. So if we have 'nm'
298308
# make sure it can read the file
299309
# NI-S 2003/08/07
@@ -367,7 +377,7 @@ index ac264c3..3f38ea0 100644
367377
if echo $libswanted | grep -v pthread >/dev/null
368378
then
369379
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
370-
@@ -375,16 +405,6 @@ $define|true|[yY]*)
380+
@@ -375,16 +415,6 @@ $define|true|[yY]*)
371381
;;
372382
esac
373383

@@ -384,7 +394,7 @@ index ac264c3..3f38ea0 100644
384394
# If using g++, the Configure scan for dlopen() and (especially)
385395
# dlerror() might fail, easier just to forcibly hint them in.
386396
case "$cc" in
387-
@@ -408,7 +428,7 @@ then
397+
@@ -408,7 +438,7 @@ then
388398
DBLIB="$DBDIR/libdb.so"
389399
if [ -f $DBLIB ]
390400
then

5.008.009-main/DevelPatchPerl.patch

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ index 6f20c5e..684f369 100644
4040
or die "Cannot exec $cpp";
4141
}
4242
diff --git a/hints/linux.sh b/hints/linux.sh
43-
index ac264c3..3f38ea0 100644
43+
index ac264c3..a985a8e 100644
4444
--- a/hints/linux.sh
4545
+++ b/hints/linux.sh
4646
@@ -13,11 +13,14 @@
@@ -123,7 +123,7 @@ index ac264c3..3f38ea0 100644
123123
ppc*)
124124
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
125125
# with -O2 ; so downgrade to -O1.
126-
@@ -143,93 +150,78 @@ case "$optimize" in
126+
@@ -143,93 +150,88 @@ case "$optimize" in
127127
;;
128128
esac
129129

@@ -235,6 +235,17 @@ index ac264c3..3f38ea0 100644
235235
- ;;
236236
- esac
237237
-fi
238+
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
239+
+# available functions, like memem, won't be used. See the discussion in
240+
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
241+
+# at least on alpine linux, the ldd --version output contains the
242+
+# string 'musl.'
243+
+case `ldd --version 2>&1` in
244+
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
245+
+ *) ;;
246+
+esac
247+
248+
-rm -f try.c a.out
238249
+# libquadmath is sometimes installed as gcc internal library,
239250
+# so contrary to our usual policy of *not* looking at gcc internal
240251
+# directories we now *do* look at them, in case they contain
@@ -252,7 +263,7 @@ index ac264c3..3f38ea0 100644
252263
+ ;;
253264
+esac
254265

255-
-rm -f try.c a.out
266+
-if /bin/sh -c exit; then
256267
+case "$libc" in
257268
+'')
258269
+# If you have glibc, then report the version for ./myconfig bug reporting.
@@ -278,13 +289,12 @@ index ac264c3..3f38ea0 100644
278289
+ done
279290
+ ;;
280291
+esac
281-
282-
-if /bin/sh -c exit; then
292+
+
283293
+if ${sh:-/bin/sh} -c exit; then
284294
echo ''
285295
echo 'You appear to have a working bash. Good.'
286296
else
287-
@@ -296,7 +288,7 @@ fi
297+
@@ -296,7 +298,7 @@ fi
288298
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
289299
#esac
290300

@@ -293,7 +303,7 @@ index ac264c3..3f38ea0 100644
293303
sparc*)
294304
case "$cccdlflags" in
295305
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
296-
@@ -311,24 +303,62 @@ esac
306+
@@ -311,24 +313,62 @@ esac
297307
# version of -lgdbm which is a bad idea. So if we have 'nm'
298308
# make sure it can read the file
299309
# NI-S 2003/08/07
@@ -367,7 +377,7 @@ index ac264c3..3f38ea0 100644
367377
if echo $libswanted | grep -v pthread >/dev/null
368378
then
369379
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
370-
@@ -375,16 +405,6 @@ $define|true|[yY]*)
380+
@@ -375,16 +415,6 @@ $define|true|[yY]*)
371381
;;
372382
esac
373383

@@ -384,7 +394,7 @@ index ac264c3..3f38ea0 100644
384394
# If using g++, the Configure scan for dlopen() and (especially)
385395
# dlerror() might fail, easier just to forcibly hint them in.
386396
case "$cc" in
387-
@@ -408,7 +428,7 @@ then
397+
@@ -408,7 +438,7 @@ then
388398
DBLIB="$DBDIR/libdb.so"
389399
if [ -f $DBLIB ]
390400
then

5.008.009-slim,threaded/DevelPatchPerl.patch

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ index 6f20c5e..684f369 100644
4040
or die "Cannot exec $cpp";
4141
}
4242
diff --git a/hints/linux.sh b/hints/linux.sh
43-
index ac264c3..3f38ea0 100644
43+
index ac264c3..a985a8e 100644
4444
--- a/hints/linux.sh
4545
+++ b/hints/linux.sh
4646
@@ -13,11 +13,14 @@
@@ -123,7 +123,7 @@ index ac264c3..3f38ea0 100644
123123
ppc*)
124124
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
125125
# with -O2 ; so downgrade to -O1.
126-
@@ -143,93 +150,78 @@ case "$optimize" in
126+
@@ -143,93 +150,88 @@ case "$optimize" in
127127
;;
128128
esac
129129

@@ -235,6 +235,17 @@ index ac264c3..3f38ea0 100644
235235
- ;;
236236
- esac
237237
-fi
238+
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
239+
+# available functions, like memem, won't be used. See the discussion in
240+
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
241+
+# at least on alpine linux, the ldd --version output contains the
242+
+# string 'musl.'
243+
+case `ldd --version 2>&1` in
244+
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
245+
+ *) ;;
246+
+esac
247+
248+
-rm -f try.c a.out
238249
+# libquadmath is sometimes installed as gcc internal library,
239250
+# so contrary to our usual policy of *not* looking at gcc internal
240251
+# directories we now *do* look at them, in case they contain
@@ -252,7 +263,7 @@ index ac264c3..3f38ea0 100644
252263
+ ;;
253264
+esac
254265

255-
-rm -f try.c a.out
266+
-if /bin/sh -c exit; then
256267
+case "$libc" in
257268
+'')
258269
+# If you have glibc, then report the version for ./myconfig bug reporting.
@@ -278,13 +289,12 @@ index ac264c3..3f38ea0 100644
278289
+ done
279290
+ ;;
280291
+esac
281-
282-
-if /bin/sh -c exit; then
292+
+
283293
+if ${sh:-/bin/sh} -c exit; then
284294
echo ''
285295
echo 'You appear to have a working bash. Good.'
286296
else
287-
@@ -296,7 +288,7 @@ fi
297+
@@ -296,7 +298,7 @@ fi
288298
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
289299
#esac
290300

@@ -293,7 +303,7 @@ index ac264c3..3f38ea0 100644
293303
sparc*)
294304
case "$cccdlflags" in
295305
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
296-
@@ -311,24 +303,62 @@ esac
306+
@@ -311,24 +313,62 @@ esac
297307
# version of -lgdbm which is a bad idea. So if we have 'nm'
298308
# make sure it can read the file
299309
# NI-S 2003/08/07
@@ -367,7 +377,7 @@ index ac264c3..3f38ea0 100644
367377
if echo $libswanted | grep -v pthread >/dev/null
368378
then
369379
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
370-
@@ -375,16 +405,6 @@ $define|true|[yY]*)
380+
@@ -375,16 +415,6 @@ $define|true|[yY]*)
371381
;;
372382
esac
373383

@@ -384,7 +394,7 @@ index ac264c3..3f38ea0 100644
384394
# If using g++, the Configure scan for dlopen() and (especially)
385395
# dlerror() might fail, easier just to forcibly hint them in.
386396
case "$cc" in
387-
@@ -408,7 +428,7 @@ then
397+
@@ -408,7 +438,7 @@ then
388398
DBLIB="$DBDIR/libdb.so"
389399
if [ -f $DBLIB ]
390400
then

5.008.009-slim/DevelPatchPerl.patch

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ index 6f20c5e..684f369 100644
4040
or die "Cannot exec $cpp";
4141
}
4242
diff --git a/hints/linux.sh b/hints/linux.sh
43-
index ac264c3..3f38ea0 100644
43+
index ac264c3..a985a8e 100644
4444
--- a/hints/linux.sh
4545
+++ b/hints/linux.sh
4646
@@ -13,11 +13,14 @@
@@ -123,7 +123,7 @@ index ac264c3..3f38ea0 100644
123123
ppc*)
124124
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
125125
# with -O2 ; so downgrade to -O1.
126-
@@ -143,93 +150,78 @@ case "$optimize" in
126+
@@ -143,93 +150,88 @@ case "$optimize" in
127127
;;
128128
esac
129129

@@ -235,6 +235,17 @@ index ac264c3..3f38ea0 100644
235235
- ;;
236236
- esac
237237
-fi
238+
+# For the musl libc, perl should #define _GNU_SOURCE. Otherwise, some
239+
+# available functions, like memem, won't be used. See the discussion in
240+
+# [perl #133760]. musl doesn't offer an easy way to identify it, but,
241+
+# at least on alpine linux, the ldd --version output contains the
242+
+# string 'musl.'
243+
+case `ldd --version 2>&1` in
244+
+ musl*) ccflags="$ccflags -D_GNU_SOURCE" ;;
245+
+ *) ;;
246+
+esac
247+
248+
-rm -f try.c a.out
238249
+# libquadmath is sometimes installed as gcc internal library,
239250
+# so contrary to our usual policy of *not* looking at gcc internal
240251
+# directories we now *do* look at them, in case they contain
@@ -252,7 +263,7 @@ index ac264c3..3f38ea0 100644
252263
+ ;;
253264
+esac
254265

255-
-rm -f try.c a.out
266+
-if /bin/sh -c exit; then
256267
+case "$libc" in
257268
+'')
258269
+# If you have glibc, then report the version for ./myconfig bug reporting.
@@ -278,13 +289,12 @@ index ac264c3..3f38ea0 100644
278289
+ done
279290
+ ;;
280291
+esac
281-
282-
-if /bin/sh -c exit; then
292+
+
283293
+if ${sh:-/bin/sh} -c exit; then
284294
echo ''
285295
echo 'You appear to have a working bash. Good.'
286296
else
287-
@@ -296,7 +288,7 @@ fi
297+
@@ -296,7 +298,7 @@ fi
288298
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
289299
#esac
290300

@@ -293,7 +303,7 @@ index ac264c3..3f38ea0 100644
293303
sparc*)
294304
case "$cccdlflags" in
295305
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
296-
@@ -311,24 +303,62 @@ esac
306+
@@ -311,24 +313,62 @@ esac
297307
# version of -lgdbm which is a bad idea. So if we have 'nm'
298308
# make sure it can read the file
299309
# NI-S 2003/08/07
@@ -367,7 +377,7 @@ index ac264c3..3f38ea0 100644
367377
if echo $libswanted | grep -v pthread >/dev/null
368378
then
369379
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
370-
@@ -375,16 +405,6 @@ $define|true|[yY]*)
380+
@@ -375,16 +415,6 @@ $define|true|[yY]*)
371381
;;
372382
esac
373383

@@ -384,7 +394,7 @@ index ac264c3..3f38ea0 100644
384394
# If using g++, the Configure scan for dlopen() and (especially)
385395
# dlerror() might fail, easier just to forcibly hint them in.
386396
case "$cc" in
387-
@@ -408,7 +428,7 @@ then
397+
@@ -408,7 +438,7 @@ then
388398
DBLIB="$DBDIR/libdb.so"
389399
if [ -f $DBLIB ]
390400
then

0 commit comments

Comments
 (0)