summaryrefslogtreecommitdiffstats
path: root/archive-libs/zlib
diff options
context:
space:
mode:
authorFlorian Franzmann2017-01-13 21:01:09 +0100
committerFlorian Franzmann2017-01-13 21:38:29 +0100
commit57bfb5a6d3e286586c0f739f5cd183b7143da3d6 (patch)
treefe02038f01f9f10c4f4a1c430fe2b360771df196 /archive-libs/zlib
parent6e1d3ea0d39d7ca98fde1ff15d965e096c4ad0b5 (diff)
archive-libs/zlib: install zlib.pc to /usr/lib/pkgconfig
Diffstat (limited to 'archive-libs/zlib')
-rw-r--r--archive-libs/zlib/0001-fix-zlib.pc-install-path.patch25
-rwxr-xr-xarchive-libs/zlib/DETAILS2
-rw-r--r--archive-libs/zlib/HISTORY5
-rwxr-xr-xarchive-libs/zlib/INSTALL4
-rwxr-xr-xarchive-libs/zlib/PRE_BUILD2
5 files changed, 33 insertions, 5 deletions
diff --git a/archive-libs/zlib/0001-fix-zlib.pc-install-path.patch b/archive-libs/zlib/0001-fix-zlib.pc-install-path.patch
new file mode 100644
index 0000000000..9f2b9b93b9
--- /dev/null
+++ b/archive-libs/zlib/0001-fix-zlib.pc-install-path.patch
@@ -0,0 +1,25 @@
+From c332e2d5043252d9a9b523b8aed9490a43339433 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf@bandrate.org>
+Date: Fri, 13 Jan 2017 20:41:39 +0100
+Subject: [PATCH] fix zlib.pc install path
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1852192..fd061cf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,7 +52,7 @@ sharedlibdir = ${libdir}
+ includedir = ${prefix}/include
+ mandir = ${prefix}/share/man
+ man3dir = ${mandir}/man3
+-pkgconfigdir = ${libdir}/pkgconfig
++pkgconfigdir = ${prefix}/lib/pkgconfig
+ SRCDIR=
+ ZINC=
+ ZINCOUT=-I.
+--
+2.11.0
+
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index 7f70044625..5f213383e2 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,6 +1,6 @@
SPELL=zlib
VERSION=1.2.10
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE_HASH=sha512:5fa71052a418a0f2b345fce28af9941bbd1c6ee276ce506ab3092157f15776ee41f96bb1799657227513b852913f96ac52dae8122a437f34b43933ee48d63ee0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index 0ae703ef28..3c2b9c6472 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,8 @@
+2017-01-13 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * INSTALL, PRE_BUILD, 0001-fix-zlib.pc-install-path.patch: install zlib.pc
+ to /usr/lib/pkgconfig instead of symlinking
+ * DETAILS: PATCHLEVEL++
+
2017-01-05 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: PATCHLEVEL=1
* INSTALL: add a symlink for zlib.pc
diff --git a/archive-libs/zlib/INSTALL b/archive-libs/zlib/INSTALL
index becd137c40..d4b8a77a60 100755
--- a/archive-libs/zlib/INSTALL
+++ b/archive-libs/zlib/INSTALL
@@ -1,6 +1,4 @@
cd $SOURCE_DIRECTORY.static &&
make prefix=$INSTALL_ROOT/usr install &&
cd $SOURCE_DIRECTORY &&
-make prefix=$INSTALL_ROOT/usr install &&
-cd $INSTALL_ROOT/usr/lib/pkgconfig &&
-ln -s $TRACK_ROOT/lib/pkgconfig/zlib.pc
+make prefix=$INSTALL_ROOT/usr install
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 90b6592d08..3756c5f364 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-#patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-zlib.pc-install-path.patch" &&
mk_source_dir "$SOURCE_DIRECTORY.static" &&
cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static