[Ipcop-svn] SF.net SVN: ipcop:[5267] ipcop/trunk/lfs

[<ow...@us...>]

Revision: 5267
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5267&view=rev
Author:   owes
Date:     2010-12-22 15:08:10 +0000 (Wed, 22 Dec 2010)

Log Message:
-----------
Tweak zlib and libusb building for hardened initramfs

Modified Paths:
--------------
    ipcop/trunk/lfs/initramfs
    ipcop/trunk/lfs/libusb
    ipcop/trunk/lfs/zlib

Modified: ipcop/trunk/lfs/initramfs
===================================================================
--- ipcop/trunk/lfs/initramfs	2010-12-22 12:48:51 UTC (rev 5266)
+++ ipcop/trunk/lfs/initramfs	2010-12-22 15:08:10 UTC (rev 5267)
@@ -288,7 +288,7 @@
 	# mklibs does both the shrinking and the stripping, so we don't have to strip libs separately
 	# NOTE: "E: Dynamic linker not found, aborting." means the binary is not dynamically linked.  Safe to ignore.
 	# replace -v by -v -v -v for more details
-	/usr/bin/mklibs -v --gcc-options=-no-fatal-warnings -L /usr/lib/libc_pic \
+	/usr/bin/mklibs -v -L /usr/lib/libc_pic \
 				-d $(INITRAMFS_DIR)/lib \
 				$(INITRAMFS_DIR)/bin/* \
 				$(INITRAMFS_DIR)/sbin/* \

Modified: ipcop/trunk/lfs/libusb
===================================================================
--- ipcop/trunk/lfs/libusb	2010-12-22 12:48:51 UTC (rev 5266)
+++ ipcop/trunk/lfs/libusb	2010-12-22 15:08:10 UTC (rev 5267)
@@ -89,8 +89,9 @@
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
-	cd $(DIR_APP) && ./configure	--prefix=/usr \
-					--target=$(MACHINE)
+	cd $(DIR_APP) && ./configure --prefix=/usr \
+					--target=$(MACHINE) \
+					--with-pic
 	cd $(DIR_APP) && make -j $(PARALLELISM)
 	cd $(DIR_APP) && make install
 

Modified: ipcop/trunk/lfs/zlib
===================================================================
--- ipcop/trunk/lfs/zlib	2010-12-22 12:48:51 UTC (rev 5266)
+++ ipcop/trunk/lfs/zlib	2010-12-22 15:08:10 UTC (rev 5267)
@@ -91,7 +91,8 @@
 	# I didn't see big difference against our CFLAGS testing with
 	# for i in $(seq 1 500);do cat zlib.h >>foo.bar ;done # create a 38 MB file
 	# for i in $(seq 1 5);do time ./minigzipsh -9 -c foo.bar | ./minigzipsh -d >/dev/null ;done; rm -f foo.bar
-	cd $(DIR_APP) && ./configure	--prefix=/usr
+	# Add -fPIC -DPIC for libz.a, needed for mklibs hardened
+	cd $(DIR_APP) && CFLAGS="$(CFLAGS) -fPIC -DPIC" ./configure --prefix=/usr
 	cd $(DIR_APP) && make
 ifeq "$(RUNNING_TEST)" "yes"
 	cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.