Debian Codegraph @

debian/patches/Version_2_6_15pre18

raw
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-19) unstable; urgency=medium
9 .
10 * Version_2_6_15pre18
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: 2025-03-25
26
27 --- gcl-2.6.14.orig/configure
28 +++ gcl-2.6.14/configure
29 @@ -4550,7 +4550,7 @@ add_args_to_cflags -fsigned-char -pipe
30 -std=gnu17 \
31 -Wall \
32 -Wno-builtin-requires-header -Wno-empty-body -Wno-self-assign \
33 - -Wno-unused-but-set-variable
34 + -Wno-unused-but-set-variable -Wno-tautological-compare
35
36 add_args_to_ldflags -no-pie # -Wl,-z,lazy
37
38 @@ -6571,7 +6571,7 @@ printf "%s\n" "$ac_cv_sizeof_time_t" >&6
39 printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h
40
41
42 -if test "$use" != "mingw" ; then
43 +if test "$use" != "mingw" && test "$use" != "386-gnu" ; then
44 if test "$ac_cv_sizeof_time_t" != "8" ; then
45 as_fn_error $? "Cannot define a 64 bit time_t" "$LINENO" 5
46 fi
47 @@ -6941,9 +6941,9 @@ rm -f core *.core core.conftest.* gmon.o
48 fi
49
50
51 -if test "$use" = "386-macosx" ; then
52 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: emulating sbrk for mac" >&5
53 -printf "%s\n" "emulating sbrk for mac" >&6; };
54 +if test "$use" = "386-macosx" || test "$use" = "386-gnu" || test "$use" = "gnuwin95" || test "$use" = "mingw" ; then
55 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: special sbrk handling" >&5
56 +printf "%s\n" "special sbrk handling" >&6; };
57 HAVE_SBRK=0
58 fi
59
60 --- gcl-2.6.14.orig/configure.in
61 +++ gcl-2.6.14/configure.in
62 @@ -261,7 +261,7 @@ add_args_to_cflags -fsigned-char -pipe
63 -std=gnu17 \
64 -Wall \
65 -Wno-builtin-requires-header -Wno-empty-body -Wno-self-assign \
66 - -Wno-unused-but-set-variable
67 + -Wno-unused-but-set-variable -Wno-tautological-compare
68
69 add_args_to_ldflags -no-pie # -Wl,-z,lazy
70
71 @@ -959,7 +959,7 @@ fi
72 AC_CHECK_HEADERS([time.h sys/time.h])
73
74 AC_CHECK_SIZEOF(time_t,[0],[#include <time.h>])
75 -if test "$use" != "mingw" ; then
76 +if test "$use" != "mingw" && test "$use" != "386-gnu" ; then
77 if test "$ac_cv_sizeof_time_t" != "8" ; then
78 AC_MSG_ERROR([Cannot define a 64 bit time_t])
79 fi
80 @@ -1121,8 +1121,8 @@ AC_RUN_IFELSE(
81 AC_MSG_RESULT([no: WARNING you must be able to emulate sbrk: as on mingw or macosx]),
82 AC_MSG_RESULT([no: WARNING you must be able to emulate sbrk: as on mingw or macosx]))
83
84 -if test "$use" = "386-macosx" ; then
85 - AC_MSG_RESULT([emulating sbrk for mac]);
86 +if test "$use" = "386-macosx" || test "$use" = "386-gnu" || test "$use" = "gnuwin95" || test "$use" = "mingw" ; then
87 + AC_MSG_RESULT([special sbrk handling]);
88 HAVE_SBRK=0
89 fi
90
91 --- gcl-2.6.14.orig/git.tag
92 +++ gcl-2.6.14/git.tag
93 @@ -1 +1 @@
94 -"Version_2_6_15pre17"
95 +"Version_2_6_15pre18"
96 --- gcl-2.6.14.orig/h/386-gnu.h
97 +++ gcl-2.6.14/h/386-gnu.h
98 @@ -62,7 +62,7 @@
99
100 #undef HAVE_D_TYPE /*FIXME defined, but not implemented in readdir*/
101 /* #define NO_FILE_LOCKING */ /*FIXME*/
102 -
103 +#define ROUNDUP(x_,y_) (((unsigned long)(x_)+(y_ -1)) & ~(y_ -1))/*FIXME double eval*/
104 #define INITIALIZE_BRK \
105 massert(!brk(gcl_alloc_initialized ? core_end : \
106 ({extern ufixnum _end;(void *)ROUNDUP((ufixnum)&_end,PAGESIZE);})))
107 --- gcl-2.6.14.orig/o/alloc.c
108 +++ gcl-2.6.14/o/alloc.c
109 @@ -120,8 +120,12 @@ expand_contblock_array(void) {
110 static void
111 contblock_array_push(void *p) {
112
113 + ufixnum f=contblock_array==Cnil ? 0 : contblock_array->v.v_fillp;/*FIXME*/
114 +
115 expand_contblock_array();
116 - contblock_array->v.v_self[contblock_array->v.v_fillp]=p;
117 + memmove(contblock_array->v.v_self+f+1,contblock_array->v.v_self+f,
118 + (contblock_array->v.v_fillp-f)*sizeof(*contblock_array->v.v_self));
119 + contblock_array->v.v_self[f]=p;
120 contblock_array->v.v_fillp++;
121
122 }
123 --- gcl-2.6.14.orig/o/main.c
124 +++ gcl-2.6.14/o/main.c
125 @@ -1251,7 +1251,7 @@ init_main(void) {
126
127 }
128
129 -#ifdef HAVE_DIS_ASM_H
130 +#if defined(HAVE_DIS_ASM_H) && defined(OUTPUT_ARCH)
131
132 #include "dis-asm.h"
133