| 1 |
Description: <short summary of the patch> |
| 2 |
TODO: Put a short summary on the line above and replace this paragraph |
| 3 |
with a longer explanation of this change. Complete the meta-information |
| 4 |
with other relevant fields (see below for details). To make it easier, the |
| 5 |
information below has been extracted from the changelog. Adjust it or drop |
| 6 |
it. |
| 7 |
. |
| 8 |
gcl (2.6.14-11) unstable; urgency=medium |
| 9 |
. |
| 10 |
* Version_2_6_15pre10 |
| 11 |
Author: Camm Maguire <[email protected]> |
| 12 |
|
| 13 |
--- |
| 14 |
The information above should follow the Patch Tagging Guidelines, please |
| 15 |
checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here |
| 16 |
are templates for supplementary fields that you might want to add: |
| 17 |
|
| 18 |
Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>) |
| 19 |
Bug: <upstream-bugtracker-url> |
| 20 |
Bug-Debian: https://bugs.debian.org/<bugnumber> |
| 21 |
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> |
| 22 |
Forwarded: (no|not-needed|<patch-forwarded-url>) |
| 23 |
Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>) |
| 24 |
Reviewed-By: <name and email of someone who approved/reviewed the patch> |
| 25 |
Last-Update: 2024-07-16 |
| 26 |
|
| 27 |
--- gcl-2.6.14.orig/configure |
| 28 |
+++ gcl-2.6.14/configure |
| 29 |
@@ -7498,11 +7498,17 @@ printf "%s\n" "$as_me: trying to adjust |
| 30 |
cat gcl.script.def | $AWK '/SIZEOF_HEADERS/ {gsub("0x[0-9]*","0x" j,$0);} {print}' j=$j >gcl.script |
| 31 |
# diff -u gcl.script.def gcl.script |
| 32 |
echo "int main() {return 0;}" >foo.c |
| 33 |
- if ( $CC $LDFLAGS -Wl,-T gcl.script foo.c -o foo && ./foo ) >/dev/null 2>&1 ; then |
| 34 |
+ if ( $CC $LDFLAGS -Wl,-T gcl.script foo.c -o foo && ./foo >/dev/null 2<&1 ) >/dev/null 2>&1 ; then |
| 35 |
if test $n -lt $min ; then min=$n; fi; |
| 36 |
if test $n -gt $max; then max=$n; fi; |
| 37 |
elif test $max -gt 0 ; then |
| 38 |
- break; |
| 39 |
+ # Workaround for false island of acceptability on riscv64, 20240716 |
| 40 |
+ if test `$AWK 'END {print n-m}' m=$min n=$max </dev/null` -gt 2 ; then |
| 41 |
+ break; |
| 42 |
+ else |
| 43 |
+ min=$lim |
| 44 |
+ max=0; |
| 45 |
+ fi |
| 46 |
fi; |
| 47 |
n=`$AWK 'END {print n+1}' n=$n </dev/null` |
| 48 |
done |
| 49 |
@@ -7526,12 +7532,12 @@ printf "%s\n" "$as_me: max log text star |
| 50 |
if test $max -ge $enable_fastimmfix && test "$enable_immfix" != "no" ; then |
| 51 |
j=`$AWK 'END {for (i=j=0;j<=n;j++) i=i ? i*2 : 1;printf("%x\n",3*i)}' n=$max </dev/null` |
| 52 |
low_shft=`$AWK 'END {print n+1}' n=$max </dev/null`; |
| 53 |
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: raising log text to $j for a $max bit wide low immfix table" >&5 |
| 54 |
-printf "%s\n" "$as_me: raising log text to $j for a $max bit wide low immfix table" >&6;} |
| 55 |
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: raising log text to 0x$j for a $max bit wide low immfix table" >&5 |
| 56 |
+printf "%s\n" "$as_me: raising log text to 0x$j for a $max bit wide low immfix table" >&6;} |
| 57 |
else |
| 58 |
j=`$AWK 'END {for (i=j=0;j<=n;j++) i=i ? i*2 : 1;printf("%x\n",3*i)}' n=$min </dev/null` |
| 59 |
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: lowering log text to $j to maximize data area" >&5 |
| 60 |
-printf "%s\n" "$as_me: lowering log text to $j to maximize data area" >&6;} |
| 61 |
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: lowering log text to 0x$j to maximize data area" >&5 |
| 62 |
+printf "%s\n" "$as_me: lowering log text to 0x$j to maximize data area" >&6;} |
| 63 |
fi |
| 64 |
fi |
| 65 |
|
| 66 |
@@ -7551,7 +7557,7 @@ printf "%s\n" "#define OBJNULL NULL" >>c |
| 67 |
# echo $j; |
| 68 |
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking our linker script" >&5 |
| 69 |
printf %s "checking our linker script... " >&6; } |
| 70 |
- if test "$j" -ne "-1" ; then |
| 71 |
+ if test "$j" != "-1" ; then |
| 72 |
cat gcl.script.def | $AWK '/SIZEOF_HEADERS/ {gsub("0x[0-9]*","0x" j,$0);} {print}' j=$j >gcl.script |
| 73 |
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 |
| 74 |
printf "%s\n" "done" >&6; } |
| 75 |
--- gcl-2.6.14.orig/configure.in |
| 76 |
+++ gcl-2.6.14/configure.in |
| 77 |
@@ -1409,11 +1409,17 @@ if test "$use" != "386-gnu" ; then #hurd |
| 78 |
cat gcl.script.def | $AWK '/SIZEOF_HEADERS/ {gsub("0x[[0-9]]*","0x" j,$0);} {print}' j=$j >gcl.script |
| 79 |
# diff -u gcl.script.def gcl.script |
| 80 |
echo "int main() {return 0;}" >foo.c |
| 81 |
- if ( $CC $LDFLAGS -Wl,-T gcl.script foo.c -o foo && ./foo ) >/dev/null 2>&1 ; then |
| 82 |
+ if ( $CC $LDFLAGS -Wl,-T gcl.script foo.c -o foo && ./foo >/dev/null 2<&1 ) >/dev/null 2>&1 ; then |
| 83 |
if test $n -lt $min ; then min=$n; fi; |
| 84 |
if test $n -gt $max; then max=$n; fi; |
| 85 |
elif test $max -gt 0 ; then |
| 86 |
- break; |
| 87 |
+ # Workaround for false island of acceptability on riscv64, 20240716 |
| 88 |
+ if test `$AWK 'END {print n-m}' m=$min n=$max </dev/null` -gt 2 ; then |
| 89 |
+ break; |
| 90 |
+ else |
| 91 |
+ min=$lim |
| 92 |
+ max=0; |
| 93 |
+ fi |
| 94 |
fi; |
| 95 |
n=`$AWK 'END {print n+1}' n=$n </dev/null` |
| 96 |
done |
| 97 |
@@ -1434,10 +1440,10 @@ if test "$use" != "386-gnu" ; then #hurd |
| 98 |
if test $max -ge $enable_fastimmfix && test "$enable_immfix" != "no" ; then |
| 99 |
j=`$AWK 'END {for (i=j=0;j<=n;j++) i=i ? i*2 : 1;printf("%x\n",3*i)}' n=$max </dev/null` |
| 100 |
low_shft=`$AWK 'END {print n+1}' n=$max </dev/null`; |
| 101 |
- AC_MSG_NOTICE([raising log text to $j for a $max bit wide low immfix table]) |
| 102 |
+ AC_MSG_NOTICE([raising log text to 0x$j for a $max bit wide low immfix table]) |
| 103 |
else |
| 104 |
j=`$AWK 'END {for (i=j=0;j<=n;j++) i=i ? i*2 : 1;printf("%x\n",3*i)}' n=$min </dev/null` |
| 105 |
- AC_MSG_NOTICE([lowering log text to $j to maximize data area]) |
| 106 |
+ AC_MSG_NOTICE([lowering log text to 0x$j to maximize data area]) |
| 107 |
fi |
| 108 |
fi |
| 109 |
|
| 110 |
@@ -1450,7 +1456,7 @@ if test "$use" != "386-gnu" ; then #hurd |
| 111 |
|
| 112 |
# echo $j; |
| 113 |
AC_MSG_CHECKING([our linker script]) |
| 114 |
- if test "$j" -ne "-1" ; then |
| 115 |
+ if test "$j" != "-1" ; then |
| 116 |
cat gcl.script.def | $AWK '/SIZEOF_HEADERS/ {gsub("0x[[0-9]]*","0x" j,$0);} {print}' j=$j >gcl.script |
| 117 |
AC_MSG_RESULT([done]) |
| 118 |
rm -f gcl.script.def |
| 119 |
--- gcl-2.6.14.orig/git.tag |
| 120 |
+++ gcl-2.6.14/git.tag |
| 121 |
@@ -1 +1 @@ |
| 122 |
-"Version_2_6_15pre9" |
| 123 |
+"Version_2_6_15pre10" |