diff --git a/archive-patches/zlib-ldflags-tests.patch b/archive-patches/zlib-ldflags-tests.patch index 19c40b74..b7885d77 100644 --- a/archive-patches/zlib-ldflags-tests.patch +++ b/archive-patches/zlib-ldflags-tests.patch @@ -14,7 +14,7 @@ Upstream-Status: Pending LDSHARED=$(CC) CPP=$(CC) -E -@@ -176,22 +176,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz. +@@ -286,22 +286,22 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz. -@rmdir objs example$(EXE): example.o $(STATICLIB) diff --git a/archive-patches/zlib-remove.ldconfig.call.patch b/archive-patches/zlib-remove.ldconfig.call.patch index 403b4825..30aeebbc 100644 --- a/archive-patches/zlib-remove.ldconfig.call.patch +++ b/archive-patches/zlib-remove.ldconfig.call.patch @@ -10,11 +10,11 @@ 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 @@ +@@ -322,7 +322,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 + rm -f $(DESTDIR)$(man3dir)/zlib.3 + cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir) diff --git a/make/system-libs.mk b/make/system-libs.mk index b85a850c..3567e366 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -1,10 +1,14 @@ # makefile to build system libs +# ----------------------------------------------------------------------------- + +ZLIB_PATCH = zlib-ldflags-tests.patch +ZLIB_PATCH += zlib-remove.ldconfig.call.patch + $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGET_DIR) $(UNTAR)/zlib-$(ZLIB_VER).tar.gz cd $(BUILD_TMP)/zlib-$(ZLIB_VER) && \ - $(PATCH)/zlib-ldflags-tests.patch && \ - $(PATCH)/zlib-remove.ldconfig.call.patch && \ + $(call apply_patches, $(ZLIB_PATCH)) && \ rm -rf config.cache && \ $(BUILDENV) \ CC=$(TARGET)-gcc \ @@ -22,6 +26,8 @@ $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/zlib-$(ZLIB_VER) touch $@ +# ----------------------------------------------------------------------------- + $(D)/libfuse: $(ARCHIVE)/fuse-$(FUSE_VER).tar.gz | $(TARGET_DIR) $(UNTAR)/fuse-$(FUSE_VER).tar.gz pushd $(BUILD_TMP)/fuse-$(FUSE_VER) && \