summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-08-28 21:41:50 -0300
committerGonzalo Exequiel Pedone2019-08-28 21:41:50 -0300
commit5d86f63adc2230b2b7cfbab89ac81d3c74720426 (patch)
tree8a0dccce16dc8e4178aa4e29d8a7adaa125f6bf3
parent4681d345b51921c9dc4b1b76cfaba659cf802b9b (diff)
downloadaur-5d86f63adc2230b2b7cfbab89ac81d3c74720426.tar.gz
Fixed library soname.
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Disable-versioning.patch75
-rw-r--r--PKGBUILD4
3 files changed, 62 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 341379b903b5..e4f92fe89d28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = android-x86-64-zlib
pkgdesc = A compression/decompression Library (android)
pkgver = 1.2.11
- pkgrel = 3
+ pkgrel = 4
url = http://www.zlib.net/
arch = any
license = custom:zlib
@@ -15,7 +15,7 @@ pkgbase = android-x86-64-zlib
source = http://zlib.net/zlib-1.2.11.tar.gz
source = 0001-Disable-versioning.patch
md5sums = 1c9f62f0778697a09d36121ead88e08e
- md5sums = 2a60cf737d0fdd05c7795b1e6d6e6b69
+ md5sums = 3e04fe1f84d547ea0ca318463e319ab7
pkgname = android-x86-64-zlib
diff --git a/0001-Disable-versioning.patch b/0001-Disable-versioning.patch
index b4c200881b86..60484470923e 100644
--- a/0001-Disable-versioning.patch
+++ b/0001-Disable-versioning.patch
@@ -1,29 +1,42 @@
--- a/configure 2016-12-31 15:06:40.000000000 -0300
-+++ b/configure 2019-04-23 19:55:16.720869239 -0300
-@@ -346,7 +346,7 @@
++++ b/configure 2019-08-28 21:22:28.163601086 -0300
+@@ -208,7 +208,7 @@
+ fi
+ case "$uname" in
+ Linux* | linux* | GNU | GNU/* | solaris*)
+- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
++ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so,--version-script,${SRCDIR}zlib.map"} ;;
+ *BSD | *bsd* | DragonFly)
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
+ LDCONFIG="ldconfig -m" ;;
+@@ -346,8 +346,8 @@
# destination names for shared library if not defined above
SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
-+SHAREDLIBV=libz.so
- SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
+-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
++SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext"}
++SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext"}
echo >> configure.log
--- a/Makefile.in 2017-01-15 14:29:40.000000000 -0300
-+++ b/Makefile.in 2019-04-23 19:46:02.358708291 -0300
-@@ -32,7 +32,7 @@
-
- STATICLIB=libz.a
++++ b/Makefile.in 2019-08-28 21:11:14.868386244 -0300
+@@ -34,7 +34,7 @@
SHAREDLIB=libz.so
--SHAREDLIBV=libz.so.1.2.11
-+SHAREDLIBV=libz.so
+ SHAREDLIBV=libz.so.1.2.11
SHAREDLIBM=libz.so.1
- LIBS=$(STATICLIB) $(SHAREDLIBV)
+-LIBS=$(STATICLIB) $(SHAREDLIBV)
++LIBS=$(STATICLIB) $(SHAREDLIB)
+
+ AR=ar
+ ARFLAGS=rc
+@@ -278,11 +278,8 @@
+ -@mv objs/gzwrite.o $@
-@@ -280,9 +280,6 @@
- placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
+-placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
++placebo $(SHAREDLIB): $(PIC_OBJS) libz.a
$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
- rm -f $(SHAREDLIB) $(SHAREDLIBM)
- ln -s $@ $(SHAREDLIB)
@@ -31,13 +44,41 @@
-@rmdir objs
example$(EXE): example.o $(STATICLIB)
-@@ -319,9 +316,6 @@
- echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
- chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
- echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
+@@ -291,11 +288,11 @@
+ minigzip$(EXE): minigzip.o $(STATICLIB)
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
+
+-examplesh$(EXE): example.o $(SHAREDLIBV)
+- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
++examplesh$(EXE): example.o $(SHAREDLIB)
++ $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIB)
+
+-minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
++minigzipsh$(EXE): minigzip.o $(SHAREDLIB)
++ $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIB)
+
+ example64$(EXE): example64.o $(STATICLIB)
+ $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
+@@ -313,15 +310,12 @@
+ cp $(STATICLIB) $(DESTDIR)$(libdir)
+ chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
+ -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
+- -@if test -n "$(SHAREDLIBV)"; then \
+- rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
+- 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); \
++ -@if test -n "$(SHAREDLIB)"; then \
++ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
++ cp $(SHAREDLIB) $(DESTDIR)$(sharedlibdir); \
++ echo "cp $(SHAREDLIB) $(DESTDIR)$(sharedlibdir)"; \
++ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
++ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB)"; \
($(LDCONFIG) || true) >/dev/null 2>&1; \
fi
rm -f $(DESTDIR)$(man3dir)/zlib.3
diff --git a/PKGBUILD b/PKGBUILD
index 86046098b443..78234eef4b6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _android_arch=x86-64
pkgname=android-${_android_arch}-zlib
pkgver=1.2.11
-pkgrel=3
+pkgrel=4
pkgdesc="A compression/decompression Library (android)"
arch=('any')
url="http://www.zlib.net/"
@@ -15,7 +15,7 @@ makedepends=('android-environment' 'android-pkg-config')
source=("http://zlib.net/zlib-${pkgver}.tar.gz"
"0001-Disable-versioning.patch")
md5sums=('1c9f62f0778697a09d36121ead88e08e'
- '2a60cf737d0fdd05c7795b1e6d6e6b69')
+ '3e04fe1f84d547ea0ca318463e319ab7')
prepare() {
cd "${srcdir}"/zlib-${pkgver}