bump version zlib-1.2.13

diff --git a/archive-patches/zlib-1.2.12-fix-cc.patch b/archive-patches/zlib-1.2.12-fix-cc.patch
deleted file mode 100644 (file)
index 1e893e1..0000000
--- a/archive-patches/zlib-1.2.12-fix-cc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure        2022-03-28 01:39:42.000000000 +0200
-+++ b/configure        2022-04-10 14:35:56.606733825 +0200
-@@ -167,14 +167,9 @@ extern int getchar();
- int hello() {return getchar();}
- EOF
- 
--if test -z "$CC"; then
--  echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
--  if ${CROSS_PREFIX}gcc -v >/dev/null 2>&1; then
--    cc=${CROSS_PREFIX}gcc
--  else
--    cc=${CROSS_PREFIX}cc
--  fi
--fi
-+test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
-+cc=${CC-${CROSS_PREFIX}gcc}
-+
- cflags=${CFLAGS-"-O3"}
- # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
- case "$cc" in

diff --git a/archive-patches/zlib-ldflags-tests.patch b/archive-patches/zlib-ldflags-tests.patch
deleted file mode 100644 (file)
index 19c40b7..0000000
--- a/archive-patches/zlib-ldflags-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Obey LDFLAGS for tests
-
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-Upstream-Status: Pending
-
---- zlib-1.2.8.orig/Makefile.in
-+++ zlib-1.2.8/Makefile.in
-@@ -26,7 +26,7 @@ CFLAGS=-O
-
- SFLAGS=-O
- LDFLAGS=
--TEST_LDFLAGS=-L. libz.a
-+TEST_LDFLAGS=-L. $(LDFLAGS)
- LDSHARED=$(CC)
- CPP=$(CC) -E
-
-@@ -176,22 +176,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.
-       -@rmdir objs
-
- example$(EXE): example.o $(STATICLIB)
--      $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
-+      $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(STATICLIB)
-
- minigzip$(EXE): minigzip.o $(STATICLIB)
--      $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
-+      $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(STATICLIB)
-
- examplesh$(EXE): example.o $(SHAREDLIBV)
--      $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
-+      $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS) $(SHAREDLIBV)
-
- minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
--      $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
-+      $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS) $(SHAREDLIBV)
-
- example64$(EXE): example64.o $(STATICLIB)
--      $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
-+      $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS) $(STATICLIB)
-
- minigzip64$(EXE): minigzip64.o $(STATICLIB)
--      $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
-+      $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) $(STATICLIB)
-
- install-libs: $(LIBS)
-       -@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi

diff --git a/archive-patches/zlib-remove.ldconfig.call.patch b/archive-patches/zlib-remove.ldconfig.call.patch
deleted file mode 100644 (file)
index 403b482..0000000
--- a/archive-patches/zlib-remove.ldconfig.call.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-
-When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache 
-(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call 
-touch */libstdc++.so && /sbin/ldconfig to fix it.
-
-So remove ldconfig call from make install-libs
-
-Upstream-Status: Inappropriate [disable feature]
-
-diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in
---- zlib-1.2.6.orig/Makefile.in        2012-01-28 23:48:50.000000000 +0100
-+++ zlib-1.2.6/Makefile.in     2012-02-13 15:38:20.577700723 +0100
-@@ -199,7 +199,6 @@
-         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
-       cp zlib.3 $(DESTDIR)$(man3dir)
-       chmod 644 $(DESTDIR)$(man3dir)/zlib.3

diff --git a/make/libraries.mk b/make/libraries.mk
index 210660fc0c7a531b3c6d792e363f2cd5b743b79b..66946e09c2d67257c243c6b9db4ad1386170c593 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -311,15 +311,13 @@ $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.xz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/zlib-$(ZLIB_VER).tar.xz
        set -e; cd $(BUILD_TMP)/zlib-$(ZLIB_VER) && \
-               $(PATCH)/zlib-1.2.12-fix-cc.patch && \
-               $(PATCH)/zlib-ldflags-tests.patch && \
-               $(PATCH)/zlib-remove.ldconfig.call.patch && \
                rm -rf config.cache && \
                $(BUILDENV) \
                CC=$(TARGET)-gcc \
                LD=$(TARGET)-ld \
                AR="$(TARGET)-ar" \
                RANLIB=$(TARGET)-ranlib \
+               CFLAGS="$(TARGET_CFLAGS) -fPIC" \
                LDFLAGS="$(TARGET_LDFLAGS)" \
                mandir=$(BUILD_TMP)/zlib-$(ZLIB_VER)/.remove \
                ./configure \

diff --git a/make/versions.mk b/make/versions.mk
index d0bf7b20095a2f51d4496c5efe9e20f62ce983ab..0322e7f3106af7bfacf8c465a4d61294ddb8f22b 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -296,7 +296,7 @@ WPA_VER = 2.10
 XUPNPD_GIT = 6578ceb
 
 # zlib; compression an decompressin library
-ZLIB_VER=1.2.12
+ZLIB_VER=1.2.13
 
 #
 # UTILS for the host...