299 lines
11 KiB
Diff
299 lines
11 KiB
Diff
diff -Naur zlib-1.2.8-orig/configure zlib-1.2.8/configure
|
|
--- zlib-1.2.8-orig/configure 2013-03-24 05:30:09.000000000 +0000
|
|
+++ zlib-1.2.8/configure 2013-05-03 20:05:11.482421900 +0000
|
|
@@ -63,7 +63,7 @@
|
|
prefix=${prefix-/usr/local}
|
|
exec_prefix=${exec_prefix-'${prefix}'}
|
|
libdir=${libdir-'${exec_prefix}/lib'}
|
|
-sharedlibdir=${sharedlibdir-'${libdir}'}
|
|
+sharedlibdir=${sharedlibdir-'${exec_prefix}/bin'}
|
|
includedir=${includedir-'${prefix}/include'}
|
|
mandir=${mandir-'${prefix}/share/man'}
|
|
shared_ext='.so'
|
|
@@ -189,14 +189,33 @@
|
|
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
|
|
LDCONFIG="ldconfig -m" ;;
|
|
CYGWIN* | Cygwin* | cygwin* | OS/2*)
|
|
+ CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64"
|
|
+ SFLAGS="${CFLAGS}"
|
|
+ LDFLAGS="-L. -lz ${old_ldflags}"
|
|
+ shared_ext=".dll"
|
|
+ SHAREDLIB='cygz.dll'
|
|
+ IMPORTLIB='libz.dll.a'
|
|
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-export-all -Wl,--enable-auto-image-base -Wl,--out-implib=${IMPORTLIB}"}
|
|
+ LDSHAREDLIBC=''
|
|
+ EXE='.exe' ;;
|
|
+ MSYS* | Msys* | msys*)
|
|
+ CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64"
|
|
+ SFLAGS="${CFLAGS}"
|
|
+ LDFLAGS="-L. -lz ${old_ldflags}"
|
|
+ shared_ext=".dll"
|
|
+ SHAREDLIB='msys-z.dll'
|
|
+ IMPORTLIB='libz.dll.a'
|
|
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-export-all -Wl,--enable-auto-image-base -Wl,--out-implib=${IMPORTLIB}"}
|
|
+ LDSHAREDLIBC=''
|
|
EXE='.exe' ;;
|
|
MINGW* | mingw*)
|
|
-# temporary bypass
|
|
- rm -f $test.[co] $test $test$shared_ext
|
|
- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
|
|
- leave 1
|
|
- LDSHARED=${LDSHARED-"$cc -shared"}
|
|
- LDSHAREDLIBC=""
|
|
+ SFLAGS="${CFLAGS}"
|
|
+ LDFLAGS="-L. -lz ${old_ldflags}"
|
|
+ shared_ext=".dll"
|
|
+ SHAREDLIB='zlib1.dll'
|
|
+ IMPORTLIB='libz.dll.a'
|
|
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-export-all -Wl,--enable-auto-image-base -Wl,--out-implib=${IMPORTLIB}"}
|
|
+ LDSHAREDLIBC=''
|
|
EXE='.exe' ;;
|
|
QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
|
|
# (alain.bonnefoy@icbt.com)
|
|
@@ -317,10 +336,31 @@
|
|
esac
|
|
fi
|
|
|
|
+case "$uname" in
|
|
+ *CYGWIN* | *Cygwin* | *cygwin* | *msys* | *MSYS* | *Msys*)
|
|
+ # On cygwin, we always build both shared and static libs
|
|
+ ALL="static shared"
|
|
+ SHAREDLIBPOST='/bin/true'
|
|
+ SHAREDTARGET=${SHAREDLIB}
|
|
+ TEST="all teststatic testshared"
|
|
+ ;;
|
|
+ *MINGW* | *Mingw* | *mingw* )
|
|
+ # On Mingw, we always build both shared and static libs
|
|
+ ALL="static shared"
|
|
+ SHAREDLIBPOST='/bin/true'
|
|
+ SHAREDTARGET=${SHAREDLIB}
|
|
+ TEST="all teststatic testshared"
|
|
+ ;;
|
|
+ *)
|
|
+
|
|
# destination names for shared library if not defined above
|
|
SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
|
|
SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
|
|
SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
|
|
+SHAREDLIBPOST='(rm -f $(SHAREDLIB) $(SHAREDLIBM); ln -s $@ $(SHAREDLIB) ; ln -s $@ $(SHAREDLIBM) )'
|
|
+SHAREDTARGET='$(SHAREDLIBV)'
|
|
+ ;;
|
|
+esac
|
|
|
|
echo >> configure.log
|
|
|
|
@@ -761,6 +801,9 @@
|
|
echo SHAREDLIBM = $SHAREDLIBM >> configure.log
|
|
echo SHAREDLIBV = $SHAREDLIBV >> configure.log
|
|
echo STATICLIB = $STATICLIB >> configure.log
|
|
+echo IMPORTLIB = $IMPORTLIB >> configure.log
|
|
+echo SHAREDLIBPOST = $SHAREDLIBPOST >> configure.log
|
|
+echo SHAREDTARGET = $SHAREDTARGET >> configure.log
|
|
echo TEST = $TEST >> configure.log
|
|
echo VER = $VER >> configure.log
|
|
echo Z_U4 = $Z_U4 >> configure.log
|
|
@@ -781,9 +824,12 @@
|
|
/^LDSHARED *=/s#=.*#=$LDSHARED#
|
|
/^CPP *=/s#=.*#=$CPP#
|
|
/^STATICLIB *=/s#=.*#=$STATICLIB#
|
|
+/^IMPORTLIB *=/s#=.*#=$IMPORTLIB#
|
|
/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
|
|
/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
|
|
/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
|
|
+/^SHAREDLIBPOST *=/s#=.*#=$SHAREDLIBPOST#
|
|
+/^SHAREDTARGET *=/s#=.*#=$SHAREDTARGET#
|
|
/^AR *=/s#=.*#=$AR#
|
|
/^ARFLAGS *=/s#=.*#=$ARFLAGS#
|
|
/^RANLIB *=/s#=.*#=$RANLIB#
|
|
@@ -809,9 +855,12 @@
|
|
/^CPP *=/s#=.*#=$CPP#
|
|
/^LDSHARED *=/s#=.*#=$LDSHARED#
|
|
/^STATICLIB *=/s#=.*#=$STATICLIB#
|
|
+/^IMPORTLIB *=/s#=.*#=$IMPORTLIB#
|
|
/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
|
|
/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
|
|
/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
|
|
+/^SHAREDLIBPOST *=/s#=.*#=$SHAREDLIBPOST#
|
|
+/^SHAREDTARGET *=/s#=.*#=$SHAREDTARGET#
|
|
/^AR *=/s#=.*#=$AR#
|
|
/^ARFLAGS *=/s#=.*#=$ARFLAGS#
|
|
/^RANLIB *=/s#=.*#=$RANLIB#
|
|
diff -Naur zlib-1.2.8-orig/Makefile.in zlib-1.2.8/Makefile.in
|
|
--- zlib-1.2.8-orig/Makefile.in 2013-04-28 22:57:11.000000000 +0000
|
|
+++ zlib-1.2.8/Makefile.in 2013-05-03 20:13:52.826171900 +0000
|
|
@@ -34,6 +34,9 @@
|
|
SHAREDLIB=libz.so
|
|
SHAREDLIBV=libz.so.1.2.8
|
|
SHAREDLIBM=libz.so.1
|
|
+IMPORTLIB=
|
|
+SHAREDLIBPOST='(rm -f $(SHAREDLIB) $(SHAREDLIBM); ln -s $@ $(SHAREDLIB) ; ln -s $@ $(SHAREDLIBM) )'
|
|
+SHAREDTARGET=$(SHAREDLIBV)
|
|
LIBS=$(STATICLIB) $(SHAREDLIBV)
|
|
|
|
AR=ar
|
|
@@ -48,7 +51,7 @@
|
|
prefix = /usr/local
|
|
exec_prefix = ${prefix}
|
|
libdir = ${exec_prefix}/lib
|
|
-sharedlibdir = ${libdir}
|
|
+sharedlibdir = ${exec_prefix}/bin
|
|
includedir = ${prefix}/include
|
|
mandir = ${prefix}/share/man
|
|
man3dir = ${mandir}/man3
|
|
@@ -114,17 +117,17 @@
|
|
rm -f $$TMP64
|
|
|
|
infcover.o: test/infcover.c zlib.h zconf.h
|
|
- $(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/infcover.c
|
|
|
|
infcover: infcover.o libz.a
|
|
- $(CC) $(CFLAGS) -o $@ infcover.o libz.a
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ infcover.o libz.a
|
|
|
|
cover: infcover
|
|
rm -f *.gcda
|
|
./infcover
|
|
gcov inf*.c
|
|
|
|
-libz.a: $(OBJS)
|
|
+$(STATICLIB): $(OBJS)
|
|
$(AR) $(ARFLAGS) $@ $(OBJS)
|
|
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
|
|
|
|
@@ -141,48 +144,49 @@
|
|
rm -f _match.s
|
|
|
|
example.o: test/example.c zlib.h zconf.h
|
|
- $(CC) $(CFLAGS) -I. -c -o $@ test/example.c
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/example.c
|
|
|
|
minigzip.o: test/minigzip.c zlib.h zconf.h
|
|
- $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/minigzip.c
|
|
|
|
example64.o: test/example.c zlib.h zconf.h
|
|
- $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c
|
|
|
|
minigzip64.o: test/minigzip.c zlib.h zconf.h
|
|
- $(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c
|
|
|
|
.SUFFIXES: .lo
|
|
|
|
+.c.o:
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $*.o $<
|
|
+
|
|
.c.lo:
|
|
-@mkdir objs 2>/dev/null || test -d objs
|
|
- $(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
|
|
+ $(CC) $(SFLAGS) $(EXTRA_CFLAGS) -DPIC -c -o objs/$*.o $<
|
|
-@mv objs/$*.o $@
|
|
|
|
-placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
|
|
- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
|
|
- rm -f $(SHAREDLIB) $(SHAREDLIBM)
|
|
- ln -s $@ $(SHAREDLIB)
|
|
- ln -s $@ $(SHAREDLIBM)
|
|
+placebo $(SHAREDTARGET): $(PIC_OBJS) $(STATICLIB)
|
|
+ $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) $(EXTRA_LDFLAGS)
|
|
+ $(SHAREDLIBPOST)
|
|
-@rmdir objs
|
|
|
|
example$(EXE): example.o $(STATICLIB)
|
|
- $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(EXTRA_LDFLAGS)
|
|
|
|
minigzip$(EXE): minigzip.o $(STATICLIB)
|
|
- $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(EXTRA_LDFLAGS)
|
|
|
|
-examplesh$(EXE): example.o $(SHAREDLIBV)
|
|
- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
|
|
+examplesh$(EXE): example.o $(SHAREDTARGET)
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ example.o -L. $(SHAREDTARGET)
|
|
|
|
-minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
|
|
- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
|
|
+minigzipsh$(EXE): minigzip.o $(SHAREDTARGET)
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ minigzip.o -L. $(SHAREDTARGET)
|
|
|
|
example64$(EXE): example64.o $(STATICLIB)
|
|
- $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(EXTRA_LDFLAGS)
|
|
|
|
minigzip64$(EXE): minigzip64.o $(STATICLIB)
|
|
- $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
|
|
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(EXTRA_LDFLAGS)
|
|
|
|
install-libs: $(LIBS)
|
|
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
|
|
@@ -190,18 +194,31 @@
|
|
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
|
|
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
|
|
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
|
|
- cp $(STATICLIB) $(DESTDIR)$(libdir)
|
|
- chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
|
|
- -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
|
|
- -@if test -n "$(SHAREDLIBV)"; then \
|
|
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
|
|
- echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
|
|
- chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
|
|
- echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
|
|
- rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
|
- ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
|
|
- ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
|
- ($(LDCONFIG) || true) >/dev/null 2>&1; \
|
|
+ cp $(STATICLIB) $(IMPORTLIB) $(DESTDIR)$(libdir)
|
|
+ -@(cd $(DESTDIR)$(libdir); chmod 644 $(STATICLIB) $(IMPORTLIB))
|
|
+ -@($(RANLIB) $(DESTDIR)$(libdir)/$(STATICLIB) || true) >/dev/null 2>&1
|
|
+ -@if test -z "$(IMPORTLIB)" ; then \
|
|
+ if test -n "$(SHAREDTARGET)" ; then \
|
|
+ if test -f "$(SHAREDTARGET)" ; then \
|
|
+ cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir); \
|
|
+ echo "cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir)"; \
|
|
+ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET); \
|
|
+ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET)"; \
|
|
+ fi; \
|
|
+ fi; \
|
|
+ if test -n "$(SHAREDLIBV)"; then \
|
|
+ if test -f "$(SHAREDLIBV)"; then \
|
|
+ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
|
+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
|
|
+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
|
+ ($(LDCONFIG) || true) >/dev/null 2>&1; \
|
|
+ fi; \
|
|
+ fi; \
|
|
+ else \
|
|
+ cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir); \
|
|
+ echo "cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir)"; \
|
|
+ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET); \
|
|
+ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET)"; \
|
|
fi
|
|
cp zlib.3 $(DESTDIR)$(man3dir)
|
|
chmod 644 $(DESTDIR)$(man3dir)/zlib.3
|
|
@@ -217,12 +234,13 @@
|
|
|
|
uninstall:
|
|
cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
|
|
- cd $(DESTDIR)$(libdir) && rm -f libz.a; \
|
|
+ cd $(DESTDIR)$(libdir); rm -f $(STATCILIB) $(IMPORTLIB); \
|
|
if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
|
|
rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
|
|
fi
|
|
cd $(DESTDIR)$(man3dir) && rm -f zlib.3
|
|
cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
|
|
+ cd $(DESTDIR)$(sharedlibdir); (rm -f $(SHAREDTARGET) || true) > /dev/null 2>&1
|
|
|
|
docs: zlib.3.pdf
|
|
|
|
@@ -245,6 +263,7 @@
|
|
example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
|
|
example64$(EXE) minigzip64$(EXE) \
|
|
infcover \
|
|
+ $(STATICLIB) $(IMPORTLIB) $(SHAREDTARGET) $(SHAREDLIBV) $(SHAREDLIBV) $(SHAREDLIBM) \
|
|
libz.* foo.gz so_locations \
|
|
_match.s maketree contrib/infback9/*.o
|
|
rm -rf objs
|