Skip to content

Commit 4118110

Browse files
zakamezakame
committed
⚙️ Regenerate Dockerfiles and patches
1 parent 2d65cb7 commit 4118110

File tree

68 files changed

+1096
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1096
-212
lines changed

‎5.008.009-main,threaded-jessie/DevelPatchPerl.patch

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
6767
or die "Cannot exec $cpp";
6868
}
6969
diff --git a/hints/linux.sh b/hints/linux.sh
70-
index ac264c3..a985a8e 100644
70+
index ac264c3..8cbe7dc 100644
7171
--- a/hints/linux.sh
7272
+++ b/hints/linux.sh
7373
@@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
150150
ppc*)
151151
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
152152
# with -O2 ; so downgrade to -O1.
153-
@@ -143,93 +150,88 @@ case "$optimize" in
153+
@@ -143,93 +150,91 @@ case "$optimize" in
154154
;;
155155
esac
156156

@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
196196
+# plibpth to bypass this check.
197197
+if [ -x /usr/bin/gcc ] ; then
198198
+ gcc=/usr/bin/gcc
199+
+# clang also provides -print-search-dirs
200+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
201+
+ gcc=${cc:-cc}
199202
else
200203
- cat <<'EOM' >&4
201204
+ gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
321324
echo ''
322325
echo 'You appear to have a working bash. Good.'
323326
else
324-
@@ -296,7 +298,7 @@ fi
327+
@@ -296,7 +301,7 @@ fi
325328
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
326329
#esac
327330

@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
330333
sparc*)
331334
case "$cccdlflags" in
332335
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
333-
@@ -311,24 +313,62 @@ esac
336+
@@ -311,24 +316,62 @@ esac
334337
# version of -lgdbm which is a bad idea. So if we have 'nm'
335338
# make sure it can read the file
336339
# NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
404407
if echo $libswanted | grep -v pthread >/dev/null
405408
then
406409
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
407-
@@ -375,16 +415,6 @@ $define|true|[yY]*)
410+
@@ -375,16 +418,6 @@ $define|true|[yY]*)
408411
;;
409412
esac
410413

@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
421424
# If using g++, the Configure scan for dlopen() and (especially)
422425
# dlerror() might fail, easier just to forcibly hint them in.
423426
case "$cc" in
424-
@@ -408,7 +438,7 @@ then
427+
@@ -408,7 +441,7 @@ then
425428
DBLIB="$DBDIR/libdb.so"
426429
if [ -f $DBLIB ]
427430
then

‎5.008.009-main-jessie/DevelPatchPerl.patch

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
6767
or die "Cannot exec $cpp";
6868
}
6969
diff --git a/hints/linux.sh b/hints/linux.sh
70-
index ac264c3..a985a8e 100644
70+
index ac264c3..8cbe7dc 100644
7171
--- a/hints/linux.sh
7272
+++ b/hints/linux.sh
7373
@@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
150150
ppc*)
151151
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
152152
# with -O2 ; so downgrade to -O1.
153-
@@ -143,93 +150,88 @@ case "$optimize" in
153+
@@ -143,93 +150,91 @@ case "$optimize" in
154154
;;
155155
esac
156156

@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
196196
+# plibpth to bypass this check.
197197
+if [ -x /usr/bin/gcc ] ; then
198198
+ gcc=/usr/bin/gcc
199+
+# clang also provides -print-search-dirs
200+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
201+
+ gcc=${cc:-cc}
199202
else
200203
- cat <<'EOM' >&4
201204
+ gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
321324
echo ''
322325
echo 'You appear to have a working bash. Good.'
323326
else
324-
@@ -296,7 +298,7 @@ fi
327+
@@ -296,7 +301,7 @@ fi
325328
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
326329
#esac
327330

@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
330333
sparc*)
331334
case "$cccdlflags" in
332335
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
333-
@@ -311,24 +313,62 @@ esac
336+
@@ -311,24 +316,62 @@ esac
334337
# version of -lgdbm which is a bad idea. So if we have 'nm'
335338
# make sure it can read the file
336339
# NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
404407
if echo $libswanted | grep -v pthread >/dev/null
405408
then
406409
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
407-
@@ -375,16 +415,6 @@ $define|true|[yY]*)
410+
@@ -375,16 +418,6 @@ $define|true|[yY]*)
408411
;;
409412
esac
410413

@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
421424
# If using g++, the Configure scan for dlopen() and (especially)
422425
# dlerror() might fail, easier just to forcibly hint them in.
423426
case "$cc" in
424-
@@ -408,7 +438,7 @@ then
427+
@@ -408,7 +441,7 @@ then
425428
DBLIB="$DBDIR/libdb.so"
426429
if [ -f $DBLIB ]
427430
then

‎5.008.009-slim,threaded-jessie/DevelPatchPerl.patch

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
6767
or die "Cannot exec $cpp";
6868
}
6969
diff --git a/hints/linux.sh b/hints/linux.sh
70-
index ac264c3..a985a8e 100644
70+
index ac264c3..8cbe7dc 100644
7171
--- a/hints/linux.sh
7272
+++ b/hints/linux.sh
7373
@@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
150150
ppc*)
151151
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
152152
# with -O2 ; so downgrade to -O1.
153-
@@ -143,93 +150,88 @@ case "$optimize" in
153+
@@ -143,93 +150,91 @@ case "$optimize" in
154154
;;
155155
esac
156156

@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
196196
+# plibpth to bypass this check.
197197
+if [ -x /usr/bin/gcc ] ; then
198198
+ gcc=/usr/bin/gcc
199+
+# clang also provides -print-search-dirs
200+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
201+
+ gcc=${cc:-cc}
199202
else
200203
- cat <<'EOM' >&4
201204
+ gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
321324
echo ''
322325
echo 'You appear to have a working bash. Good.'
323326
else
324-
@@ -296,7 +298,7 @@ fi
327+
@@ -296,7 +301,7 @@ fi
325328
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
326329
#esac
327330

@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
330333
sparc*)
331334
case "$cccdlflags" in
332335
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
333-
@@ -311,24 +313,62 @@ esac
336+
@@ -311,24 +316,62 @@ esac
334337
# version of -lgdbm which is a bad idea. So if we have 'nm'
335338
# make sure it can read the file
336339
# NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
404407
if echo $libswanted | grep -v pthread >/dev/null
405408
then
406409
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
407-
@@ -375,16 +415,6 @@ $define|true|[yY]*)
410+
@@ -375,16 +418,6 @@ $define|true|[yY]*)
408411
;;
409412
esac
410413

@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
421424
# If using g++, the Configure scan for dlopen() and (especially)
422425
# dlerror() might fail, easier just to forcibly hint them in.
423426
case "$cc" in
424-
@@ -408,7 +438,7 @@ then
427+
@@ -408,7 +441,7 @@ then
425428
DBLIB="$DBDIR/libdb.so"
426429
if [ -f $DBLIB ]
427430
then

‎5.008.009-slim-jessie/DevelPatchPerl.patch

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
6767
or die "Cannot exec $cpp";
6868
}
6969
diff --git a/hints/linux.sh b/hints/linux.sh
70-
index ac264c3..a985a8e 100644
70+
index ac264c3..8cbe7dc 100644
7171
--- a/hints/linux.sh
7272
+++ b/hints/linux.sh
7373
@@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
150150
ppc*)
151151
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
152152
# with -O2 ; so downgrade to -O1.
153-
@@ -143,93 +150,88 @@ case "$optimize" in
153+
@@ -143,93 +150,91 @@ case "$optimize" in
154154
;;
155155
esac
156156

@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
196196
+# plibpth to bypass this check.
197197
+if [ -x /usr/bin/gcc ] ; then
198198
+ gcc=/usr/bin/gcc
199+
+# clang also provides -print-search-dirs
200+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
201+
+ gcc=${cc:-cc}
199202
else
200203
- cat <<'EOM' >&4
201204
+ gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
321324
echo ''
322325
echo 'You appear to have a working bash. Good.'
323326
else
324-
@@ -296,7 +298,7 @@ fi
327+
@@ -296,7 +301,7 @@ fi
325328
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
326329
#esac
327330

@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
330333
sparc*)
331334
case "$cccdlflags" in
332335
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
333-
@@ -311,24 +313,62 @@ esac
336+
@@ -311,24 +316,62 @@ esac
334337
# version of -lgdbm which is a bad idea. So if we have 'nm'
335338
# make sure it can read the file
336339
# NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
404407
if echo $libswanted | grep -v pthread >/dev/null
405408
then
406409
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
407-
@@ -375,16 +415,6 @@ $define|true|[yY]*)
410+
@@ -375,16 +418,6 @@ $define|true|[yY]*)
408411
;;
409412
esac
410413

@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
421424
# If using g++, the Configure scan for dlopen() and (especially)
422425
# dlerror() might fail, easier just to forcibly hint them in.
423426
case "$cc" in
424-
@@ -408,7 +438,7 @@ then
427+
@@ -408,7 +441,7 @@ then
425428
DBLIB="$DBDIR/libdb.so"
426429
if [ -f $DBLIB ]
427430
then

‎5.010.001-main,threaded-jessie/DevelPatchPerl.patch

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ index f8ca492..204bba0 100644
119119
+ $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
120120
}
121121
diff --git a/hints/linux.sh b/hints/linux.sh
122-
index c88f157..a985a8e 100644
122+
index c88f157..8cbe7dc 100644
123123
--- a/hints/linux.sh
124124
+++ b/hints/linux.sh
125125
@@ -13,11 +13,14 @@
@@ -203,7 +203,7 @@ index c88f157..a985a8e 100644
203203
ppc*)
204204
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
205205
# with -O2 ; so downgrade to -O1.
206-
@@ -146,93 +150,88 @@ case "$optimize" in
206+
@@ -146,93 +150,91 @@ case "$optimize" in
207207
;;
208208
esac
209209

@@ -249,6 +249,9 @@ index c88f157..a985a8e 100644
249249
+# plibpth to bypass this check.
250250
+if [ -x /usr/bin/gcc ] ; then
251251
+ gcc=/usr/bin/gcc
252+
+# clang also provides -print-search-dirs
253+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
254+
+ gcc=${cc:-cc}
252255
else
253256
- cat <<'EOM' >&4
254257
+ gcc=gcc
@@ -374,7 +377,7 @@ index c88f157..a985a8e 100644
374377
echo ''
375378
echo 'You appear to have a working bash. Good.'
376379
else
377-
@@ -299,7 +298,7 @@ fi
380+
@@ -299,7 +301,7 @@ fi
378381
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
379382
#esac
380383

@@ -383,7 +386,7 @@ index c88f157..a985a8e 100644
383386
sparc*)
384387
case "$cccdlflags" in
385388
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
386-
@@ -314,30 +313,62 @@ esac
389+
@@ -314,30 +316,62 @@ esac
387390
# version of -lgdbm which is a bad idea. So if we have 'nm'
388391
# make sure it can read the file
389392
# NI-S 2003/08/07
@@ -463,7 +466,7 @@ index c88f157..a985a8e 100644
463466
if echo $libswanted | grep -v pthread >/dev/null
464467
then
465468
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
466-
@@ -384,16 +415,6 @@ $define|true|[yY]*)
469+
@@ -384,16 +418,6 @@ $define|true|[yY]*)
467470
;;
468471
esac
469472

@@ -480,7 +483,7 @@ index c88f157..a985a8e 100644
480483
# If using g++, the Configure scan for dlopen() and (especially)
481484
# dlerror() might fail, easier just to forcibly hint them in.
482485
case "$cc" in
483-
@@ -417,7 +438,7 @@ then
486+
@@ -417,7 +441,7 @@ then
484487
DBLIB="$DBDIR/libdb.so"
485488
if [ -f $DBLIB ]
486489
then

‎5.010.001-main-jessie/DevelPatchPerl.patch

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ index f8ca492..204bba0 100644
119119
+ $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
120120
}
121121
diff --git a/hints/linux.sh b/hints/linux.sh
122-
index c88f157..a985a8e 100644
122+
index c88f157..8cbe7dc 100644
123123
--- a/hints/linux.sh
124124
+++ b/hints/linux.sh
125125
@@ -13,11 +13,14 @@
@@ -203,7 +203,7 @@ index c88f157..a985a8e 100644
203203
ppc*)
204204
# on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
205205
# with -O2 ; so downgrade to -O1.
206-
@@ -146,93 +150,88 @@ case "$optimize" in
206+
@@ -146,93 +150,91 @@ case "$optimize" in
207207
;;
208208
esac
209209

@@ -249,6 +249,9 @@ index c88f157..a985a8e 100644
249249
+# plibpth to bypass this check.
250250
+if [ -x /usr/bin/gcc ] ; then
251251
+ gcc=/usr/bin/gcc
252+
+# clang also provides -print-search-dirs
253+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
254+
+ gcc=${cc:-cc}
252255
else
253256
- cat <<'EOM' >&4
254257
+ gcc=gcc
@@ -374,7 +377,7 @@ index c88f157..a985a8e 100644
374377
echo ''
375378
echo 'You appear to have a working bash. Good.'
376379
else
377-
@@ -299,7 +298,7 @@ fi
380+
@@ -299,7 +301,7 @@ fi
378381
#'osfmach3ppc') ccdlflags='-Wl,-E' ;;
379382
#esac
380383

@@ -383,7 +386,7 @@ index c88f157..a985a8e 100644
383386
sparc*)
384387
case "$cccdlflags" in
385388
*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
386-
@@ -314,30 +313,62 @@ esac
389+
@@ -314,30 +316,62 @@ esac
387390
# version of -lgdbm which is a bad idea. So if we have 'nm'
388391
# make sure it can read the file
389392
# NI-S 2003/08/07
@@ -463,7 +466,7 @@ index c88f157..a985a8e 100644
463466
if echo $libswanted | grep -v pthread >/dev/null
464467
then
465468
set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
466-
@@ -384,16 +415,6 @@ $define|true|[yY]*)
469+
@@ -384,16 +418,6 @@ $define|true|[yY]*)
467470
;;
468471
esac
469472

@@ -480,7 +483,7 @@ index c88f157..a985a8e 100644
480483
# If using g++, the Configure scan for dlopen() and (especially)
481484
# dlerror() might fail, easier just to forcibly hint them in.
482485
case "$cc" in
483-
@@ -417,7 +438,7 @@ then
486+
@@ -417,7 +441,7 @@ then
484487
DBLIB="$DBDIR/libdb.so"
485488
if [ -f $DBLIB ]
486489
then

0 commit comments

Comments
 (0)