From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Mon, 3 Dec 2007 18:05:02 +0000 (+0000)
Subject: Enabled stripping.
X-Git-Tag: v3.0-alpha1~1137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf63eea73588d4f194bbf03d3acc0d5b01b5dda5;p=ipfire-3.x.git

Enabled stripping.
Disabled parallel build on bind.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1117 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/lfs/bind b/lfs/bind
index 6eb83aacc..426002e67 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -55,12 +55,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make -C lib/dns -j $(PARALLELISM)
-	cd $(DIR_APP) && make -C lib/isc -j $(PARALLELISM)
-	cd $(DIR_APP) && make -C lib/bind9 -j $(PARALLELISM)
-	cd $(DIR_APP) && make -C lib/isccfg -j $(PARALLELISM)
-	cd $(DIR_APP) && make -C lib/lwres -j $(PARALLELISM)
-	cd $(DIR_APP) && make -C bin/dig -j $(PARALLELISM)
+	cd $(DIR_APP) && make -C lib/dns #-j $(PARALLELISM)
+	cd $(DIR_APP) && make -C lib/isc #-j $(PARALLELISM)
+	cd $(DIR_APP) && make -C lib/bind9 #-j $(PARALLELISM)
+	cd $(DIR_APP) && make -C lib/isccfg #-j $(PARALLELISM)
+	cd $(DIR_APP) && make -C lib/lwres #-j $(PARALLELISM)
+	cd $(DIR_APP) && make -C bin/dig #-j $(PARALLELISM)
 	cd $(DIR_APP) && make -C bin/dig install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/strip b/lfs/strip
index 590eab5ab..0922dad2a 100644
--- a/lfs/strip
+++ b/lfs/strip
@@ -27,8 +27,8 @@ include Config
 PKG_NAME   = strip
 VER        = LFS
 
-THISAPP    = strip
-TARGET     = $(DIR_INFO)/$(THISAPP)
+THISAPP    = $(PKG_NAME)-$(VER)
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -50,3 +50,10 @@ ifeq "$(STAGE)" "toolchain"
 	rm -rf $(TOOLS_DIR)/{,share/}{info,man}
 	chown -R root:root $(LFS)$(TOOLS_DIR)
 endif
+
+ifeq "$(STAGE)" "packages"
+	-$(TOOLS_DIR)/bin/find /{,usr/}{bin,lib,sbin} -type f ! -name make ! -name bash -exec \
+		$(TOOLS_DIR)/bin/strip --strip-debug '{}' ';'
+	-$(TOOLS_DIR)/bin/find /{,usr/}{bin,sbin} -type f ! -name make ! -name bash -exec \
+		$(TOOLS_DIR)/bin/strip --strip-all '{}' ';'
+endif
diff --git a/make.sh b/make.sh
index 118339226..4d763ef9a 100755
--- a/make.sh
+++ b/make.sh
@@ -79,7 +79,7 @@ toolchain_build() {
 	toolchain_make tar
 	toolchain_make texinfo
 	toolchain_make util-linux
-	# toolchain_make strip
+	toolchain_make strip
 	export PATH=$ORG_PATH
 }
 
@@ -198,7 +198,7 @@ ipfire_build() {
 	ipfire_make pam																			PASS=2
 	
 	#ipfire_make libidn		### Do we need this?
-  ipfire_make pcre
+	ipfire_make pcre
 	ipfire_make popt
 	ipfire_make python
 	ipfire_make libxml2
@@ -206,8 +206,8 @@ ipfire_build() {
 	ipfire_make slang
 	ipfire_make newt
 	ipfire_make cyrus-sasl
-  ipfire_make openldap
-  ipfire_make sqlite
+	ipfire_make openldap
+	ipfire_make sqlite
 	ipfire_make curl
 	ipfire_make libusb
 	ipfire_make gnupg
@@ -255,28 +255,28 @@ ipfire_build() {
 	ipfire_make lighttpd
 	ipfire_make lzma
 	ipfire_make collectd
-  #ipfire_make logrotate
-  #ipfire_make logwatch	
+	#ipfire_make logrotate
+	#ipfire_make logwatch	
 	ipfire_make cpio
 	ipfire_make cdrtools
 	ipfire_make parted
 	ipfire_make memtest86+
-  #ipfire_make pakfire
-  #ipfire_make initscripts
+	#ipfire_make pakfire
+	#ipfire_make initscripts
   
-  ### -------------------------------------------------------------------------
-  ### Tools that maybe not needed
-  #	
-  #ipfire_make expat
-  #ipfire_make gmp
-  #ipfire_make gd
-  #ipfire_make libcap
-  #ipfire_make mtools
-  #ipfire_make mISDN
-
-  #ipfire_make nasm
-  #ipfire_make wireless
-  #ipfire_make libsafe
+	### -------------------------------------------------------------------------
+	### Tools that maybe not needed
+	#	
+	#ipfire_make expat
+	#ipfire_make gmp
+	#ipfire_make gd
+	#ipfire_make libcap
+	#ipfire_make mtools
+	#ipfire_make mISDN
+	
+	#ipfire_make nasm
+	#ipfire_make wireless
+	#ipfire_make libsafe
 }
 
 ################################################################################
@@ -313,15 +313,15 @@ misc_build() {
 	#
 	## NTFS
 	#ipfire_make fuse
-  #ipfire_make ntfs-3g
-  #
-  ## Net tools
-  #ipfire_make bwm-ng
-  #ipfire_make openvpn
-  #
-  ## UPNP
-  #ipfire_make libupnp
-  #ipfire_make linux-igd
+	#ipfire_make ntfs-3g
+	#
+	## Net tools
+	#ipfire_make bwm-ng
+	#ipfire_make openvpn
+	#
+	## UPNP
+	#ipfire_make libupnp
+	#ipfire_make linux-igd
 		
 	### These will become addons as usual but will be integrated later
 	#
@@ -402,7 +402,7 @@ packages_build() {
 	
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
 
-  ipfire_make strip
+  toolchain_make strip
   
   # Generating list of packages used
 	### MISSING ATM