diff options
| author | Vlad Glagolev | 2010-03-16 11:35:54 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2010-03-16 11:35:54 +0300 |
| commit | 68e6b8f09dc6d06e5e38e576c8ffebdeae424387 (patch) | |
| tree | ab46e58cb6e9bb071020c86e27054b57cad1df3f /archive-libs/zlib | |
| parent | 5eecd118dfc818a2b57521ce8e010bdaf15035b2 (diff) | |
zlib: small corrections after the last update
Diffstat (limited to 'archive-libs/zlib')
| -rwxr-xr-x | archive-libs/zlib/BUILD | 1 | ||||
| -rwxr-xr-x | archive-libs/zlib/DETAILS | 1 | ||||
| -rw-r--r-- | archive-libs/zlib/HISTORY | 8 | ||||
| -rwxr-xr-x | archive-libs/zlib/PRE_BUILD | 12 | ||||
| -rw-r--r-- | archive-libs/zlib/pkgpath.patch | 11 |
5 files changed, 27 insertions, 6 deletions
diff --git a/archive-libs/zlib/BUILD b/archive-libs/zlib/BUILD index 55b597af71..67c31e637f 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 940d0f0a55..bb213d271a 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 a4c945206d..83938a3f9c 100644 --- a/archive-libs/zlib/HISTORY +++ b/archive-libs/zlib/HISTORY @@ -1,4 +1,10 @@ -52010-03-15 Sukneet Basuta <sukneet@sourcemage.org> +2010-03-16 Vlad Glagolev <stealth@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@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 0105c1e018..6db4d60c55 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 0000000000..de436cceb1 --- /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 |