components/runtime/chezscheme/patches/04-system-zlib.patch

   1 Only in ChezScheme-9.5.2: .patched
   2 Only in ChezScheme-9.5.2: .patched-01-luuid.patch
   3 Only in ChezScheme-9.5.2: .patched-02-il-ld.patch
   4 Only in ChezScheme-9.5.2: .patched-03-gmtoff.patch
   5 Only in ChezScheme-9.5.2: .prep
   6 diff -ru ChezScheme-9.5.2.orig/c/Mf-a6s2 ChezScheme-9.5.2/c/Mf-a6s2
   7 --- ChezScheme-9.5.2.orig/c/Mf-a6s2     2019-03-21 18:05:24.000000000 +0000
   8 +++ ChezScheme-9.5.2/c/Mf-a6s2  2019-08-25 16:23:34.243758990 +0000
   9 @@ -16,7 +16,7 @@
  10  m = a6s2
  11  Cpu = X86_64
  12
  13 -mdclib = -lnsl -ldl -lm -lcurses -lrt -luuid
  14 +mdclib = -lnsl -ldl -lm -lcurses -lrt -luuid -lz
  15  C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O ${CFLAGS}
  16  o = o
  17  mdsrc = i3le.c
  18 @@ -30,11 +30,8 @@
  19
  20  include Mf-base
  21
  22 -${Kernel}: ${kernelobj} ../zlib/libz.a
  23 -       /bin/ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a
  24 +${Kernel}: ${kernelobj}
  25 +       /bin/ld -r -o ${Kernel} ${kernelobj}
  26
  27  ${Scheme}: ${Kernel} ${Main}
  28         $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
  29 -
  30 -../zlib/configure.log:
  31 -       (cd ../zlib; CFLAGS=-m64 ./configure --64)
  32 Only in ChezScheme-9.5.2/c: Mf-a6s2.~1~
  33 Only in ChezScheme-9.5.2/c: Mf-a6s2.~2~
  34 diff -ru ChezScheme-9.5.2.orig/c/Mf-base ChezScheme-9.5.2/c/Mf-base
  35 --- ChezScheme-9.5.2.orig/c/Mf-base     2019-03-21 18:05:24.000000000 +0000
  36 +++ ChezScheme-9.5.2/c/Mf-base  2019-08-25 16:22:36.296685268 +0000
  37 @@ -54,7 +54,7 @@
  38  ${kernelobj}: system.h types.h version.h externs.h globals.h segment.h thread.h sort.h
  39  ${kernelobj}: ${Include}/equates.h ${Include}/scheme.h
  40  ${mainobj}: ${Include}/scheme.h
  41 -${kernelobj}: ../zlib/zconf.h ../zlib/zlib.h
  42 +${kernelobj}:
  43  gc-ocd.o gc-oce.o: gc.c
  44
  45  ../zlib/zlib.h ../zlib/zconf.h: ../zlib/configure.log
  46 diff -ru ChezScheme-9.5.2.orig/c/Mf-i3s2 ChezScheme-9.5.2/c/Mf-i3s2
  47 --- ChezScheme-9.5.2.orig/c/Mf-i3s2     2019-03-21 18:05:24.000000000 +0000
  48 +++ ChezScheme-9.5.2/c/Mf-i3s2  2019-08-25 16:24:13.152327983 +0000
  49 @@ -16,7 +16,7 @@
  50  m = i3s2
  51  Cpu = I386
  52
  53 -mdclib = -lnsl -ldl -lm -lcurses -lrt -luuid
  54 +mdclib = -lnsl -ldl -lm -lcurses -lrt -luuid -lz
  55  C = ${CC} ${CFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O ${CPPFLAGS}
  56  o = o
  57  mdsrc = i3le.c
  58 @@ -26,12 +26,12 @@
  59  .SUFFIXES: .c .o
  60
  61  .c.o:
  62 -       $C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
  63 +       $C -c -DSOLARIS -D${Cpu} -I${Include} $*.c
  64
  65  include Mf-base
  66
  67 -${Kernel}: ${kernelobj} ../zlib/libz.a
  68 -       /bin/ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a
  69 +${Kernel}: ${kernelobj}
  70 +       /bin/ld -r -o ${Kernel} ${kernelobj}
  71
  72  ${Scheme}: ${Kernel} ${Main}
  73         $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
  74 diff -ru ChezScheme-9.5.2.orig/c/Mf-ta6s2 ChezScheme-9.5.2/c/Mf-ta6s2
  75 --- ChezScheme-9.5.2.orig/c/Mf-ta6s2    2019-03-21 18:05:24.000000000 +0000
  76 +++ ChezScheme-9.5.2/c/Mf-ta6s2 2019-08-25 16:23:58.255504663 +0000
  77 @@ -16,7 +16,7 @@
  78  m = ta6s2
  79  Cpu = X86_64
  80
  81 -mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -luuid
  82 +mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -luuid -lz
  83  C = ${CC} ${CPPFLAGS} -m64 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS}
  84  o = o
  85  mdsrc = i3le.c
  86 @@ -26,15 +26,12 @@
  87  .SUFFIXES: .c .o
  88
  89  .c.o:
  90 -       $C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
  91 +       $C -c -DSOLARIS -D${Cpu} -I${Include} $*.c
  92
  93  include Mf-base
  94
  95 -${Kernel}: ${kernelobj} ../zlib/libz.a
  96 -       /bin/ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a
  97 +${Kernel}: ${kernelobj}
  98 +       /bin/ld -r -o ${Kernel} ${kernelobj}
  99
 100  ${Scheme}: ${Kernel} ${Main}
 101         $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 102 -
 103 -../zlib/configure.log:
 104 -       (cd ../zlib; CFLAGS=-m64 ./configure --64)
 105 Only in ChezScheme-9.5.2/c: Mf-ta6s2.~1~
 106 Only in ChezScheme-9.5.2/c: Mf-ta6s2.~2~
 107 diff -ru ChezScheme-9.5.2.orig/c/Mf-ti3s2 ChezScheme-9.5.2/c/Mf-ti3s2
 108 --- ChezScheme-9.5.2.orig/c/Mf-ti3s2    2019-03-21 18:05:24.000000000 +0000
 109 +++ ChezScheme-9.5.2/c/Mf-ti3s2 2019-08-25 16:24:36.560269634 +0000
 110 @@ -16,7 +16,7 @@
 111  m = ti3s2
 112  Cpu = I386
 113
 114 -mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -luuid
 115 +mdclib = -lnsl -ldl -lm -lpthread -lcurses -lrt -luuid -lz
 116  C = ${CC} ${CPPFLAGS} -m32 -Wpointer-arith -Wextra -Werror -O2 -D_REENTRANT ${CFLAGS}
 117  o = o
 118  mdsrc = i3le.c
 119 @@ -26,15 +26,12 @@
 120  .SUFFIXES: .c .o
 121
 122  .c.o:
 123 -       $C -c -DSOLARIS -D${Cpu} -I${Include} -I../zlib $*.c
 124 +       $C -c -DSOLARIS -D${Cpu} -I${Include} $*.c
 125
 126  include Mf-base
 127
 128 -${Kernel}: ${kernelobj} ../zlib/libz.a
 129 -       /bin/ld -r -o ${Kernel} ${kernelobj} ../zlib/libz.a
 130 +${Kernel}: ${kernelobj}
 131 +       /bin/ld -r -o ${Kernel} ${kernelobj}
 132
 133  ${Scheme}: ${Kernel} ${Main}
 134         $C -o ${Scheme} ${Kernel} ${Main} ${mdclib} ${LDFLAGS}
 135 -
 136 -../zlib/configure.log:
 137 -       (cd ../zlib; CFLAGS=-m32 ./configure)
 138 Only in ChezScheme-9.5.2/c: stats.c.~1~
 139 diff -ru ChezScheme-9.5.2.orig/configure ChezScheme-9.5.2/configure
 140 --- ChezScheme-9.5.2.orig/configure     2019-03-21 18:05:24.000000000 +0000
 141 +++ ChezScheme-9.5.2/configure  2019-08-25 16:22:51.538238461 +0000
 142 @@ -331,11 +331,6 @@
 143      (curl  -L -o v1.9.tar.gz https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.tar.gz && tar -zxf v1.9.tar.gz && mv nanopass-framework-scheme-1.9 nanopass && rm v1.9.tar.gz) || exit 1
 144    fi
 145
 146 -  if [ ! -f 'zlib/configure' ] ; then
 147 -    rmdir zlib > /dev/null 2>&1
 148 -    (curl -L -o v1.2.11.tar.gz https://github.com/madler/zlib/archive/v1.2.11.tar.gz && tar -xzf v1.2.11.tar.gz && mv zlib-1.2.11 zlib && rm v1.2.11.tar.gz) || exit 1
 149 -  fi
 150 -
 151    if [ ! -f 'stex/Mf-stex' ] ; then
 152      rmdir stex > /dev/null 2>&1
 153      (curl -L -o v1.2.1.tar.gz https://github.com/dybvig/stex/archive/v1.2.1.tar.gz && tar -zxf v1.2.1.tar.gz && mv stex-1.2.1 stex && rm v1.2.1.tar.gz) || exit 1