Index: BOOK/final-system/common/zlib.xml
===================================================================
--- BOOK/final-system/common/zlib.xml (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/final-system/common/zlib.xml (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -34,52 +34,36 @@
Installation of Zlib
-
- Zlib is known to build its shared library incorrectly if
- CFLAGS is specified in the environment. If using a
- specified CFLAGS variable, be sure to add the
- directive to the CFLAGS
- variable for the duration of the configure command below, then
- remove it afterwards.
-
+ This patch will add -fPIC to our build and allow us to build
+ a static and shared library at the same time:
- Prepare Zlib for compilation:
+patch -Np1 -i ../&zlib-fpic-patch;
-./configure --prefix=/usr --shared --libdir=/lib
+ Prepare Zlib for compilation:
- Compile the package:
+./configure --prefix=/usr --shared
-make
+ Compile the package:
- To test the results, issue:
+make
+
+ To test the results, issue:
make check.
- Install the shared library:
+ Installation:
-make install
+make install
- The previous command installed a The previous command installed a .so file in /lib. We will remove it and relink it into
- /usr/lib:
+ class="directory">/usr/lib. We will remove itinto
+ /lib and then relink it
+ to /usr/lib:
-rm /lib/libz.so
-ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so
+mv /usr/lib/libz.so.*
+ln -sf ../../lib/libz.so.1 /usr/lib/libz.so
- Build the static library:
+ Now we fix the permissions on the static library:
-make clean
-./configure --prefix=/usr
-make
-
- To test the results again, issue:
- make check.
-
- Install the static library:
-
-make install
-
- Fix the permissions on the static library:
-
-chmod 644 /usr/lib/libz.a
+chmod 644 /usr/lib/libz.a
Index: BOOK/final-system/multilib/zlib-64bit.xml
===================================================================
--- BOOK/final-system/multilib/zlib-64bit.xml (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/final-system/multilib/zlib-64bit.xml (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -24,12 +24,16 @@
+ xpointer="xpointer(//*[@os='p1'])"/>
+ xpointer="xpointer(//*[@os='p2'])"/>
+
+
CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
- --shared --libdir=/lib64
+ --shared --libdir=/usr/lib64
-
+ The previous command installed a .so file in /usr/lib64. We will remove itinto
+ /lib64 and then relink it
+ to /usr/lib64:
- The previous command installed a .so file in /lib64. We will remove it and relink it into
- /usr/lib64:
-
-rm /lib64/libz.so
-ln -sf ../../lib64/libz.so.&zlib-version; /usr/lib64/libz.so
+mv /usr/lib64/libz.so.*
+ln -sf ../../lib64/libz.so.1 /usr/lib64/libz.so
+ xpointer="xpointer(//*[@os='j'])"/>
-make clean
-CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
- --prefix=/usr --libdir=/usr/lib64
-make
-
-
-
-
-
-
-
-
-
-chmod 644 /usr/lib64/libz.a
+chmod 644 /usr/lib64/libz.a
Index: BOOK/final-system/multilib/zlib-n32.xml
===================================================================
--- BOOK/final-system/multilib/zlib-n32.xml (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/final-system/multilib/zlib-n32.xml (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -25,12 +25,20 @@
+ xpointer="xpointer(//*[@os='p1'])"/>
+ xpointer="xpointer(//*[@os='p2'])"/>
-CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
- --shared --libdir=/lib32
+
+
+CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
+ --shared --libdir=/usr/lib32
+
+
-
+ The previous command installed a .so file in /usr/lib32. We will remove itinto
+ /lib32 and then relink it
+ to /usr/lib32:
- The previous command installed a .so file in /lib32. We will remove it and relink it into
- /usr/lib32:
-
-rm /lib32/libz.so
-ln -sf ../../lib32/libz.so.&zlib-version; /usr/lib32/libz.so
+mv /usr/lib32/libz.so.*
+ln -sf ../../lib32/libz.so.1 /usr/lib32/libz.so
+ xpointer="xpointer(//*[@os='j'])"/>
-make clean
-CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure \
- --prefix=/usr --libdir=/usr/lib32
-make
-
-
-
-
-
-
-
-
-
-chmod 644 /usr/lib32/libz.a
+chmod 644 /usr/lib32/libz.a
Index: BOOK/final-system/multilib/zlib.xml
===================================================================
--- BOOK/final-system/multilib/zlib.xml (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/final-system/multilib/zlib.xml (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -25,12 +25,20 @@
+ xpointer="xpointer(//*[@os='p1'])"/>
+ xpointer="xpointer(//*[@os='p2'])"/>
-CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
- --shared --libdir=/lib
+
+
+CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
+ --shared
+
+
-make clean
-CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr
-make
-
-
-
-
-
-
-
-
-
-
-
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/general.ent (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -1,5 +1,5 @@
-
+
@@ -15,5 +15,5 @@
-
+
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/introduction/common/changelog.xml (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -38,13 +38,23 @@
+ January 11, 2006
+
+
+ [jim] - Rewrote wrote zlib final instructions to include
+ a patch the will allow build of static and shared libraries at
+ the same time. Thanx for the recommendation Tushar Teredesai.
+
+
+
+
+
January 8, 2006
[Chris] - Rewrote much of the description of the build
-process and test suite information.
-
-
-
-
+ process and test suite information.
+
+
+
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/materials/common/patches.xml (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -224,4 +224,11 @@
+
+ Zlib fPIC Patch - 3.2 KB:
+
+
+
+
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent (revision f013de9e669fc2170d74e89acd7a4156660ee632)
+++ BOOK/patches.ent (revision 27178aea21d2793f9980503eaa65d3f0517d34f9)
@@ -60,4 +60,6 @@
+
+