diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-05 23:08:31 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-08 14:41:35 +0200 |
| commit | 78fb92bbe3fb004cedeba34e880abbcf004c7d6e (patch) | |
| tree | bedb235df05531c6aa434cf71f3957020fa7f841 /patches | |
| parent | 19bcc1692738c8a4292d34a38dc0178832497ddb (diff) | |
| download | ptxdist-78fb92bbe3fb004cedeba34e880abbcf004c7d6e.tar.gz ptxdist-78fb92bbe3fb004cedeba34e880abbcf004c7d6e.tar.xz | |
[zlib] version bump 1.2.3 -> 1.2.5
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 | 35 | ||||
| -rw-r--r-- | patches/zlib-1.2.5/fix-install.diff | 22 | ||||
| -rw-r--r-- | patches/zlib-1.2.5/series | 1 |
3 files changed, 58 insertions, 0 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 new file mode 100644 index 000000000..a179817da --- /dev/null +++ b/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch @@ -0,0 +1,35 @@ +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 + +"make install" tries to install the shared lib even if only +the static lib is compiled. This patch makes installing the +shared lib conditional. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + Makefile.in | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 5b15bd0..82639e6 100644 +--- 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); \ +-- +1.7.1 + diff --git a/patches/zlib-1.2.5/fix-install.diff b/patches/zlib-1.2.5/fix-install.diff new file mode 100644 index 000000000..d9620b8bf --- /dev/null +++ b/patches/zlib-1.2.5/fix-install.diff @@ -0,0 +1,22 @@ +--- + 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 new file mode 100644 index 000000000..390d14160 --- /dev/null +++ b/patches/zlib-1.2.5/series @@ -0,0 +1 @@ +0001-install-fix-for-static-only.patch |