source: freewrt/package/zlib/patches/zlib.patch@ 475ad56

freewrt_1_0 freewrt_2_0
Last change on this file since 475ad56 was 475ad56, checked in by Waldemar Brodkorb <wbx@…>, 20 years ago

add OpenWrt trunk revision 3830.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1 afb5a338-a214-0410-bd46-81f09a774fd1
  • Property mode set to 100644
File size: 6.2 KB

  • Makefile.in 

    diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in
    old new  
    2525#           -Wstrict-prototypes -Wmissing-prototypes
    2626
    2727LDFLAGS=libz.a
    28 LDSHARED=$(CC)
     28LDSHARED=$(CC) -shared -Wl,-soname,$(SHAREDLIBM)
    2929CPP=$(CC) -E
    3030
    31 LIBS=libz.a
     31LIBS=
     32STATICLIB=libz.a
    3233SHAREDLIB=libz.so
    3334SHAREDLIBV=libz.so.1.2.3
    3435SHAREDLIBM=libz.so.1
    3536
    36 AR=ar rc
     37AR=ar
    3738RANLIB=ranlib
    3839TAR=tar
    3940SHELL=/bin/sh
    4041EXE=
    4142
     43DESTDIR =
     44
    4245prefix = /usr/local
    4346exec_prefix = ${prefix}
    4447libdir = ${exec_prefix}/lib
    … …  
    6770          echo '                *** zlib test FAILED ***'; \
    6871        fi
    6972
    70 libz.a: $(OBJS) $(OBJA)
    71         $(AR) $@ $(OBJS) $(OBJA)
     73$(STATICLIB): $(OBJS) $(OBJA)
     74        $(AR) rc $@ $(OBJS) $(OBJA)
    7275        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
    7376
    7477match.o: match.S
    … …  
    7780        mv _match.o match.o
    7881        rm -f _match.s
    7982
     83$(SHAREDLIB): $(SHAREDLIBV)
     84
    8085$(SHAREDLIBV): $(OBJS)
    81         $(LDSHARED) -o $@ $(OBJS)
     86        $(LDSHARED) -lc -o $@ $(OBJS)
    8287        rm -f $(SHAREDLIB) $(SHAREDLIBM)
    8388        ln -s $@ $(SHAREDLIB)
    8489        ln -s $@ $(SHAREDLIBM)
    … …  
    9095        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
    9196
    9297install: $(LIBS)
    93         -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
    94         -@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
    95         -@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
    96         -@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
    97         cp zlib.h zconf.h $(includedir)
    98         chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
    99         cp $(LIBS) $(libdir)
    100         cd $(libdir); chmod 755 $(LIBS)
    101         -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
    102         cd $(libdir); if test -f $(SHAREDLIBV); then \
     98        -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
     99        -@if [ ! -d $(DESTDIR)$(includedir)  ]; then mkdir -p $(DESTDIR)$(includedir); fi
     100        -@if [ ! -d $(DESTDIR)$(libdir)      ]; then mkdir -p $(DESTDIR)$(libdir); fi
     101        -@if [ ! -d $(DESTDIR)$(man3dir)     ]; then mkdir -p $(DESTDIR)$(man3dir); fi
     102        cp zlib.h zconf.h $(DESTDIR)$(includedir)
     103        chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
     104        cp $(STATICLIB) $(SHAREDLIBV) $(DESTDIR)$(libdir)
     105        cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
     106        -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
     107        cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
    103108          rm -f $(SHAREDLIB) $(SHAREDLIBM); \
    104109          ln -s $(SHAREDLIBV) $(SHAREDLIB); \
    105110          ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
    106111          (ldconfig || true)  >/dev/null 2>&1; \
    107112        fi
    108         cp zlib.3 $(man3dir)
    109         chmod 644 $(man3dir)/zlib.3
     113        cp zlib.3 $(DESTDIR)$(man3dir)
     114        chmod 644 $(DESTDIR)$(man3dir)/zlib.3
    110115# The ranlib in install is needed on NeXTSTEP which checks file times
    111116# ldconfig is for Linux
    112117

  • configure 

    diff -ruN zlib-1.2.3-orig/configure zlib-1.2.3-2/configure
    old new  
    2323VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
    2424VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
    2525VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
    26 AR=${AR-"ar rc"}
     26AR=${AR-"ar"}
    2727RANLIB=${RANLIB-"ranlib"}
    2828prefix=${prefix-/usr/local}
    2929exec_prefix=${exec_prefix-'${prefix}'}
    … …  
    7373
    7474if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
    7575  CC="$cc"
    76   SFLAGS=${CFLAGS-"-fPIC -O3"}
     76  SFLAGS=${CFLAGS-"-D_REENTRANT -fPIC -O3"}
    7777  CFLAGS="$cflags"
    7878  case `(uname -s || echo unknown) 2>/dev/null` in
    7979  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
    … …  
    408408  echo Checking for mmap support... No.
    409409fi
    410410
     411cat > $test.c <<EOF
     412#include <stdio.h>
     413int main() { char buf[10]; snprintf(buf, sizeof(buf), "%s", "F"); return 0; }
     414EOF
     415if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
     416  echo "Checking for snprintf...         Yes."
     417  CFLAGS="$CFLAGS -DHAS_snprintf"
     418else
     419  echo "Checking for snprintf..  No."
     420fi
     421
     422cat > $test.c <<EOF
     423#include <stdio.h>
     424#include <stdarg.h>
     425int main(void) { va_list a; vsnprintf(0, 0, "", a); return 0; }
     426EOF
     427if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
     428  echo "Checking for vsnprintf...        Yes."
     429  CFLAGS="$CFLAGS -DHAS_vsnprintf"
     430else
     431  echo "Checking for vsnprintf..         No."
     432fi
     433
    411434CPP=${CPP-"$CC -E"}
    412435case $CFLAGS in
    413436  *ASMV*)
    … …  
    424447# udpate Makefile
    425448sed < Makefile.in "
    426449/^CC *=/s#=.*#=$CC#
    427 /^CFLAGS *=/s#=.*#=$CFLAGS#
    428 /^CPP *=/s#=.*#=$CPP#
    429 /^LDSHARED *=/s#=.*#=$LDSHARED#
    430 /^LIBS *=/s#=.*#=$LIBS#
    431 /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
    432 /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
    433 /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
    434 /^AR *=/s#=.*#=$AR#
    435 /^RANLIB *=/s#=.*#=$RANLIB#
    436 /^EXE *=/s#=.*#=$EXE#
    437 /^prefix *=/s#=.*#=$prefix#
    438 /^exec_prefix *=/s#=.*#=$exec_prefix#
    439 /^libdir *=/s#=.*#=$libdir#
    440 /^includedir *=/s#=.*#=$includedir#
    441 /^mandir *=/s#=.*#=$mandir#
    442 /^LDFLAGS *=/s#=.*#=$LDFLAGS#
     450/^CC *=/s%=.*%= $CC%
     451/^CFLAGS *=/s%=.*%= $CFLAGS%
     452/^CPP *=/s%=.*%= $CPP%
     453/^LDSHARED *=/s%=.*%= $LDSHARED%
     454/^LIBS *=/s%=.*%= $LIBS%
     455/^SHAREDLIB *=/s%=.*%= $SHAREDLIB%
     456/^SHAREDLIBV *=/s%=.*%= $SHAREDLIBV%
     457/^SHAREDLIBM *=/s%=.*%= $SHAREDLIBM%
     458/^AR *=/s%=.*%= $AR%
     459/^RANLIB *=/s%=.*%= $RANLIB%
     460/^EXE *=/s%=.*%= $EXE%
     461/^prefix *=/s%=.*%= $prefix%
     462/^exec_prefix *=/s%=.*%= $exec_prefix%
     463/^libdir *=/s%=.*%= $libdir%
     464/^includedir *=/s%=.*%= $includedir%
     465/^mandir *=/s%=.*%= $mandir%
     466/^LDFLAGS *=/s%=.*%= $LDFLAGS%
    443467" > Makefile

  • contrib/minizip/Makefile 

    diff -ruN zlib-1.2.3-orig/contrib/minizip/Makefile zlib-1.2.3-2/contrib/minizip/Makefile
    old new  
    11CC=cc
    2 CFLAGS=-O -I../..
     2CFLAGS=-O2 -g -I../.. -Dunix
    33
    4 UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
    5 ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
     4UNZ_OBJS = miniunz.o unzip.o ioapi.o
     5ZIP_OBJS = minizip.o zip.o   ioapi.o
    66
    77.c.o:
    88        $(CC) -c $(CFLAGS) $*.c
    … …  
    1010all: miniunz minizip
    1111
    1212miniunz:  $(UNZ_OBJS)
    13         $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
     13        $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) -L ../.. -lz
    1414
    1515minizip:  $(ZIP_OBJS)
    16         $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
     16        $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) -L ../.. -lz
    1717
    1818test:   miniunz minizip
    1919        ./minizip test readme.txt
Note: See TracBrowser for help on using the repository browser.