diff options
| author | George Sherwood | 2011-01-09 10:58:40 -0600 |
|---|---|---|
| committer | George Sherwood | 2011-01-09 10:58:40 -0600 |
| commit | 591c6443704baece384ec8b96740bd883169f7c9 (patch) | |
| tree | b1930818d64f72b582f3f5dbf7d7491f338a4d63 /archive-libs/zlib | |
| parent | 902d0545eb36581a17fcbeb5dd64cbdf14fa6694 (diff) | |
zlip: Added sed from LFS to fix zlib.h. UP_TRIGGERS to ensure system
is stable. Should also fix Bug 15927.
Diffstat (limited to 'archive-libs/zlib')
| -rwxr-xr-x | archive-libs/zlib/DETAILS | 2 | ||||
| -rw-r--r-- | archive-libs/zlib/HISTORY | 7 | ||||
| -rwxr-xr-x | archive-libs/zlib/PRE_BUILD | 2 | ||||
| -rwxr-xr-x | archive-libs/zlib/UP_TRIGGERS | 11 |
4 files changed, 21 insertions, 1 deletions
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS index d16c27782d..7e0729ff9a 100755 --- a/archive-libs/zlib/DETAILS +++ b/archive-libs/zlib/DETAILS @@ -1,6 +1,6 @@ SPELL=zlib VERSION=1.2.5 - PATCHLEVEL=0 + PATCHLEVEL=1 SOURCE_HASH=sha512:88e8aa4bd2f23233cc6c0f52e568c7d8d2c18a69170c2363b574fbe5c86ce352d0768178c3fde6372576c45e0fdf80537ebde773689e3ad8584baddb889d0ede SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY index 4c692007da..79ad89edc5 100644 --- a/archive-libs/zlib/HISTORY +++ b/archive-libs/zlib/HISTORY @@ -1,3 +1,10 @@ +2011-01-09 George Sherwood <gsherwood@sourcemage.org> + * DETAILS: PATCHLEVEL++ + * PRE_BUILD: Add patch from LFS + http://www.linuxfromscratch.org/lfs/view/stable/chapter06/zlib.html + * UP_TRIGGERS: Added to rebuild level 1 depends if old header + is installed + 2010-04-21 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.2.5 diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD index 6db4d60c55..5685f17160 100755 --- a/archive-libs/zlib/PRE_BUILD +++ b/archive-libs/zlib/PRE_BUILD @@ -3,5 +3,7 @@ cd "$SOURCE_DIRECTORY" && patch -p0 < "$SPELL_DIRECTORY/pkgpath.patch" && +sed -i 's/ifdef _LARGEFILE64_SOURCE/ifndef _LARGEFILE64_SOURCE/' zlib.h && + mk_source_dir "$SOURCE_DIRECTORY.static" && cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static diff --git a/archive-libs/zlib/UP_TRIGGERS b/archive-libs/zlib/UP_TRIGGERS new file mode 100755 index 0000000000..cacaeab143 --- /dev/null +++ b/archive-libs/zlib/UP_TRIGGERS @@ -0,0 +1,11 @@ +# run if unpatched zlib.h is found + +local OLD_SPELL_VERSION="" +spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" +if [ "${OLD_SPELL_VERSION}" == "1.2.5" ]; then + if grep -q "ifdef _LARGEFILE64_SOURCE" $INSTALL_ROOT/usr/include/zlib.h; then + for each in $(show_up_depends $SPELL 1); do + up_trigger $each cast_self + done + fi +fi |