diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-15 18:48:55 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-16 10:56:59 +0200 |
| commit | 93404d8498a71496bc708e0d429148bf47e9a0d8 (patch) | |
| tree | 58b0a52390db2a9786964325c8afb467e0d85827 /patches | |
| parent | 498e76c9c515c0798cedbdcc657f134edda38eb8 (diff) | |
| download | ptxdist-93404d8498a71496bc708e0d429148bf47e9a0d8.tar.gz ptxdist-93404d8498a71496bc708e0d429148bf47e9a0d8.tar.xz | |
[zlib] add patch for broken parallel building
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/zlib-1.2.5/0001-install-fix-for-static-only.patch | 1 | ||||
| -rw-r--r-- | patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch | 24 | ||||
| -rw-r--r-- | patches/zlib-1.2.5/fix-install.diff | 22 | ||||
| -rw-r--r-- | patches/zlib-1.2.5/series | 3 |
4 files changed, 27 insertions, 23 deletions
diff --git a/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch b/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch index a179817da..57aa1225f 100644 --- a/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch +++ b/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch @@ -1,4 +1,3 @@ -From 284019e9903de7ef550e61ec9ce64aed63779916 Mon Sep 17 00:00:00 2001 From: Michael Olbrich <m.olbrich@pengutronix.de> Date: Mon, 5 Jul 2010 22:51:51 +0200 Subject: [PATCH] install: fix for static only diff --git a/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch b/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch new file mode 100644 index 000000000..71f90ed5f --- /dev/null +++ b/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 15 Jul 2010 14:50:27 +0200 +Subject: [PATCH] don't link the shared lib against the static lib + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index bd9edd2..e6c2ead 100755 +--- a/configure ++++ b/configure +@@ -19,7 +19,6 @@ if [ -n "${CHOST}" ]; then + fi + + STATICLIB=libz.a +-LDFLAGS="${LDFLAGS} -L. ${STATICLIB}" + VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` + VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h` + VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` +-- +1.7.1 + diff --git a/patches/zlib-1.2.5/fix-install.diff b/patches/zlib-1.2.5/fix-install.diff deleted file mode 100644 index d9620b8bf..000000000 --- a/patches/zlib-1.2.5/fix-install.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- - Makefile.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -168,10 +168,11 @@ install-libs: $(LIBS) - -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi - -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi - cp $(STATICLIB) $(DESTDIR)$(libdir) -- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) - cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) - -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 -- -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ -+ -@if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ -+ cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ -+ cd $(DESTDIR)$(sharedlibdir); \ - chmod 755 $(SHAREDLIBV); \ - rm -f $(SHAREDLIB) $(SHAREDLIBM); \ - ln -s $(SHAREDLIBV) $(SHAREDLIB); \ diff --git a/patches/zlib-1.2.5/series b/patches/zlib-1.2.5/series index 390d14160..3ba4f262b 100644 --- a/patches/zlib-1.2.5/series +++ b/patches/zlib-1.2.5/series @@ -1 +1,4 @@ +# generated by git-ptx-patches 0001-install-fix-for-static-only.patch +0002-don-t-link-the-shared-lib-against-the-static-lib.patch +# e8400e7168293e2c816fd639c49ee4ce - git-ptx-patches magic |