Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (591c6443704baece384ec8b96740bd883169f7c9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (591c6443704baece384ec8b96740bd883169f7c9)
  • Date: Sun, 9 Jan 2011 10:56:47 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

archive-libs/zlib/DETAILS | 2 +-
archive-libs/zlib/HISTORY | 7 +++++++
archive-libs/zlib/PRE_BUILD | 2 ++
archive-libs/zlib/UP_TRIGGERS | 11 +++++++++++
4 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 591c6443704baece384ec8b96740bd883169f7c9
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

zlip: Added sed from LFS to fix zlib.h. UP_TRIGGERS to ensure system
is stable. Should also fix Bug 15927.

diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index d16c277..7e0729f 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 4c69200..79ad89e 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,10 @@
+2011-01-09 George Sherwood <gsherwood AT 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 AT vabo.cz>
* DETAILS: 1.2.5

diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 6db4d60..5685f17 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 0000000..cacaeab
--- /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



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (591c6443704baece384ec8b96740bd883169f7c9), George Sherwood, 01/09/2011

Archive powered by MHonArc 2.6.24.

Top of Page