[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. a262a310c7c300b3c9870c8452f61784c53a84ca
git
git at cross-lfs.org
Mon Apr 26 18:54:57 PDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via a262a310c7c300b3c9870c8452f61784c53a84ca (commit)
from dbfb372a6f120da276cc4629955b498df08edd75 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a262a310c7c300b3c9870c8452f61784c53a84ca
Author: kb0iic <kb0iic at meander.cross-lfs.org>
Date: Tue Apr 27 01:54:47 2010 +0000
Update to zlib 1.2.5 from 1.2.3
diff --git a/BOOK/final-system/common/zlib.xml b/BOOK/final-system/common/zlib.xml
index 1d98b7d..448c97a 100644
--- a/BOOK/final-system/common/zlib.xml
+++ b/BOOK/final-system/common/zlib.xml
@@ -25,15 +25,10 @@
<sect2 role="installation">
<title>Installation of Zlib</title>
- <para os="p1">This patch will add -fPIC to our build and allow us to build
- a static and shared library at the same time:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&zlib-fpic-patch;</userinput></screen>
-
<para os="a">Prepare Zlib for compilation:</para>
<screen os="b"><userinput>CC="gcc -isystem /usr/include" CXX="g++ -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/lib" ./configure --prefix=/usr --shared</userinput></screen>
+ LDFLAGS="-Wl,-rpath-link,/lib" ./configure --prefix=/usr</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 4bc0e89..89572f0 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -451,8 +451,8 @@
<!ENTITY yaboot-md5 "9b1246c474eeb37f61081ad762563b35">
<!ENTITY yaboot-home "http://yaboot.ozlabs.org">
-<!ENTITY zlib-version "1.2.3">
-<!ENTITY zlib-size "484 KB">
+<!ENTITY zlib-version "1.2.5">
+<!ENTITY zlib-size "532 KB">
<!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.gz">
-<!ENTITY zlib-md5 "debc62758716a169df9f62e6ab2bc634">
+<!ENTITY zlib-md5 "c735eab2d659a96e5a594c9e8541ad63">
<!ENTITY zlib-home "http://www.zlib.net">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index c3e6126..8a1a4d5 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -112,10 +112,6 @@
<!ENTITY vim-branch_update-patch-md5 "68e540fbf2a06d9760a9b4d4b486b506">
<!ENTITY vim-branch_update-patch-size "737 KB">
-<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-2.patch">
-<!ENTITY zlib-fpic-patch-md5 "b1e6644c97b04c368e11c0a1554f2efe">
-<!ENTITY zlib-fpic-patch-size "3 KB">
-
<!-- Start of multilib patches -->
<!ENTITY binutils-multilib-patch "binutils-&binutils-version;-genscripts_multilib-1.patch">
diff --git a/BOOK/temp-system/common/zlib.xml b/BOOK/temp-system/common/zlib.xml
index 35afe69..abc440d 100644
--- a/BOOK/temp-system/common/zlib.xml
+++ b/BOOK/temp-system/common/zlib.xml
@@ -26,7 +26,7 @@
href="../../final-system/common/zlib.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>./configure --prefix=/tools --shared</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
<variablelist os="aa">
<title>The meaning of the configure options:</title>
diff --git a/patches/zlib-1.2.3-fPIC-2.patch b/patches/zlib-1.2.3-fPIC-2.patch
deleted file mode 100644
index a83d237..0000000
--- a/patches/zlib-1.2.3-fPIC-2.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Submitted By: Jim Gifford <jim at cross-lfs dot org>
-Originally Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
-Date: 2009-05-7
-Initial Package Version: 1.2.2
-Origin: Gentoo ebuild?
-Upstream Status: Not submitted
-Description:
- 1. Build shared and static lib in one pass
- 2. Always add -fPIC when building shared lib, don't expect the user to set it.
-
-To build the shared and static library:
- ./configure --prefix=<prefix> --shared &&
- make &&
- make install
-Remove the --shared if you don't want the shared lib.
-
-diff -Naur zlib-1.2.3.orig/configure zlib-1.2.3/configure
---- zlib-1.2.3.orig/configure 2005-07-11 13:11:57.000000000 -0700
-+++ zlib-1.2.3/configure 2009-05-07 12:09:31.000000000 -0700
-@@ -23,7 +23,7 @@
- VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
- VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
- VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
--AR=${AR-"ar rc"}
-+AR=${AR-"ar"}
- RANLIB=${RANLIB-"ranlib"}
- prefix=${prefix-/usr/local}
- exec_prefix=${exec_prefix-'${prefix}'}
-@@ -73,7 +73,11 @@
-
- if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
- CC="$cc"
-- SFLAGS=${CFLAGS-"-fPIC -O3"}
-+ #SFLAGS=${CFLAGS-"-fPIC -O3"}
-+ # the above is horribly wrong on a few archs where -fPIC should ALWAYS be
-+ # used in the creation of shared libraries. without the following, the
-+ # shared lib test will sometimes fail even when shared libs -can- be created.
-+ SFLAGS="${CFLAGS-"-O3"} -fPIC"
- CFLAGS="$cflags"
- case `(uname -s || echo unknown) 2>/dev/null` in
- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
-@@ -174,7 +178,7 @@
- if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
- CFLAGS="$SFLAGS"
-- LIBS="$SHAREDLIBV"
-+ LIBS="$LIBS $SHAREDLIBV"
- echo Building shared library $SHAREDLIBV with $CC.
- elif test -z "$old_cc" -a -z "$old_cflags"; then
- echo No shared library support.
-diff -Naur zlib-1.2.3.orig/Makefile.in zlib-1.2.3/Makefile.in
---- zlib-1.2.3.orig/Makefile.in 2005-07-17 19:25:21.000000000 -0700
-+++ zlib-1.2.3/Makefile.in 2009-05-07 12:10:15.000000000 -0700
-@@ -49,6 +49,8 @@
- OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
- zutil.o inflate.o infback.o inftrees.o inffast.o
-
-+PIC_OBJS = $(OBJS:%.o=%.lo)
-+
- OBJA =
- # to use the asm code: make OBJA=match.o
-
-@@ -68,7 +70,7 @@
- fi
-
- libz.a: $(OBJS) $(OBJA)
-- $(AR) $@ $(OBJS) $(OBJA)
-+ $(AR) rc $@ $(OBJS) $(OBJA)
- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
- match.o: match.S
-@@ -77,8 +79,11 @@
- mv _match.o match.o
- rm -f _match.s
-
--$(SHAREDLIBV): $(OBJS)
-- $(LDSHARED) -o $@ $(OBJS)
-+%.lo: %.c
-+ $(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@
-+
-+$(SHAREDLIBV): $(PIC_OBJS)
-+ $(LDSHARED) -o $@ $(PIC_OBJS) -lc
- rm -f $(SHAREDLIB) $(SHAREDLIBM)
- ln -s $@ $(SHAREDLIB)
- ln -s $@ $(SHAREDLIBM)
-@@ -89,13 +94,10 @@
- minigzip$(EXE): minigzip.o $(LIBS)
- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-
--install: $(LIBS)
-+install-libs: $(LIBS)
- - at if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
-- - at if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi
- - at if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi
- - at if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi
-- cp zlib.h zconf.h $(includedir)
-- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
- cp $(LIBS) $(libdir)
- cd $(libdir); chmod 755 $(LIBS)
- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@@ -110,6 +112,11 @@
- # The ranlib in install is needed on NeXTSTEP which checks file times
- # ldconfig is for Linux
-
-+install: install-libs
-+ - at if [ ! -d $(includedir) ]; then mkdir $(includedir); fi
-+ cp zlib.h zconf.h $(includedir)
-+ chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-+
- uninstall:
- cd $(includedir); \
- cd $(libdir); rm -f libz.a; \
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/zlib.xml | 7 +--
BOOK/packages.ent | 6 +-
BOOK/patches.ent | 4 -
BOOK/temp-system/common/zlib.xml | 2 +-
patches/zlib-1.2.3-fPIC-2.patch | 112 -------------------------------------
5 files changed, 5 insertions(+), 126 deletions(-)
delete mode 100644 patches/zlib-1.2.3-fPIC-2.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list