Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (68e6b8f09dc6d06e5e38e576c8ffebdeae424387)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (68e6b8f09dc6d06e5e38e576c8ffebdeae424387)
  • Date: Tue, 16 Mar 2010 03:36:02 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

archive-libs/zlib/BUILD | 1 +
archive-libs/zlib/DETAILS | 1 +
archive-libs/zlib/HISTORY | 8 +++++++-
archive-libs/zlib/PRE_BUILD | 12 +++++++-----
archive-libs/zlib/pkgpath.patch | 11 +++++++++++
5 files changed, 27 insertions(+), 6 deletions(-)

New commits:
commit 68e6b8f09dc6d06e5e38e576c8ffebdeae424387
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

zlib: small corrections after the last update

diff --git a/archive-libs/zlib/BUILD b/archive-libs/zlib/BUILD
index 55b597a..67c31e6 100755
--- a/archive-libs/zlib/BUILD
+++ b/archive-libs/zlib/BUILD
@@ -1,3 +1,4 @@
+OPTS="--eprefix=$INSTALL_ROOT $OPTS" &&

CFLAGS="$CFLAGS -DPIC -fPIC" &&

diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index 940d0f0..bb213d2 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -1,5 +1,6 @@
SPELL=zlib
VERSION=1.2.4
+ PATCHLEVEL=1

SOURCE_HASH=sha512:385ba58d27ff02cc5a264180d6c2bb8b3789a555504c669907e294adce2d6bd36ba14da196eab811cdf7f11ab43ac1b38e9d3ea5f44f8616a5e5dbf3a60906de
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index a4c9452..83938a3 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,4 +1,10 @@
-52010-03-15 Sukneet Basuta <sukneet AT sourcemage.org>
+2010-03-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: moved $OPTS here from PRE_BUILD
+ * PRE_BUILD: apply the patch; quoting paths; cleaned up
+ * pkgpath.patch: added, to fix pkgconfig path (pkgconfig: /lib ->
/usr/lib)
+
+2010-03-15 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 1.2.4
* PRE_BUILD, Makfile.patch: removed Makfile.patch, I'm pretty
sure this patch is not needed, no longer applicable
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 0105c1e..6db4d60 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -1,5 +1,7 @@
-OPTS="--eprefix=$INSTALL_ROOT $OPTS" &&
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-mk_source_dir $SOURCE_DIRECTORY.static &&
-cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" &&
+
+mk_source_dir "$SOURCE_DIRECTORY.static" &&
+cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static
diff --git a/archive-libs/zlib/pkgpath.patch b/archive-libs/zlib/pkgpath.patch
new file mode 100644
index 0000000..de436cc
--- /dev/null
+++ b/archive-libs/zlib/pkgpath.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2010-03-14 05:10:27.000000000 +0300
++++ Makefile.in 2010-03-16 11:16:50.868545002 +0300
+@@ -48,7 +48,7 @@
+ includedir = ${prefix}/include
+ mandir = ${prefix}/share/man
+ man3dir = ${mandir}/man3
+-pkgconfigdir = ${libdir}/pkgconfig
++pkgconfigdir = ${prefix}/lib/pkgconfig
+
+ OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+ gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o
zutil.o



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (68e6b8f09dc6d06e5e38e576c8ffebdeae424387), Vlad Glagolev, 03/16/2010

Archive powered by MHonArc 2.6.24.

Top of Page