Author: alexander
Date: 2006-05-08 04:20:36 -0600 (Mon, 08 May 2006)
New Revision: 1539
Modified:
trunk/Makefile
trunk/packages/binutils/Makefile
trunk/packages/linux-libc-headers/Makefile
trunk/packages/openssl/Makefile
Log:
Cleanups
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-05-08 01:59:41 UTC (rev 1538)
+++ trunk/Makefile 2006-05-08 10:20:36 UTC (rev 1539)
@@ -424,7 +424,7 @@
#==============================================================================
clean: unmount
- @-rm -rf $(WD) $(MP)$(WD) $(MPBASE)$(WD)
+ @-rm -rf $(WD) $(MPBASE)$(WD)
@-userdel lfs
@-groupdel lfs
@-rm -rf /home/lfs
Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile 2006-05-08 01:59:41 UTC (rev 1538)
+++ trunk/packages/binutils/Makefile 2006-05-08 10:20:36 UTC (rev 1539)
@@ -7,8 +7,6 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 5c80fd5657da47efc16a63fdd93ef7395319fbbf
-DEPS= $(FILE) $(PATCHES)
-
# Targets
include $(ROOT)/scripts/functions
@@ -74,11 +72,10 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: $(DEPS)
+stage2: $(FILE)
$(sep_dir_build)
compile-stage2:
- cd ../$(DIR) ; for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ;
done
../$(DIR)/configure --prefix=/usr --enable-shared
make $(PM) tooldir=/usr
make tooldir=/usr install
Modified: trunk/packages/linux-libc-headers/Makefile
===================================================================
--- trunk/packages/linux-libc-headers/Makefile 2006-05-08 01:59:41 UTC (rev
1538)
+++ trunk/packages/linux-libc-headers/Makefile 2006-05-08 10:20:36 UTC (rev
1539)
@@ -10,34 +10,28 @@
include $(ROOT)/packages/$(NM)/$(ARCHVARS)
-DEPS= $(FILE) $(PATCHES)
-
# Targets
include $(ROOT)/scripts/functions
-stage1: $(DEPS)
+stage1: $(FILE)
$(std_build)
- for i in $(DEPS) ; do cp $(SRC)/$$i $(LFSSRC) ; done
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
- for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done
install -d $(WD)/include
cp -Rv include/$(LLH_ASM) $(WD)/include/asm
- for ASM in $(LLH_ASMS) ; do cp -Rv include/$$ASM $(WD)/include ; done
cp -Rv include/linux $(WD)/include
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: $(DEPS)
+stage2: $(FILE)
$(std_build)
compile-stage2:
- for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done
cp -Rv include/$(LLH_ASM) /usr/include/asm
- for ASM in $(LLH_ASMS) ; do cp -Rv include/$$ASM /usr/include/ ; done
cp -Rv include/linux /usr/include
chown -R root:root /usr/include
find /usr/include -type d -exec chmod 755 {} \;
Modified: trunk/packages/openssl/Makefile
===================================================================
--- trunk/packages/openssl/Makefile 2006-05-08 01:59:41 UTC (rev 1538)
+++ trunk/packages/openssl/Makefile 2006-05-08 10:20:36 UTC (rev 1539)
@@ -27,14 +27,15 @@
$(std_build)
compile-stage2:
- for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done
- $(CONFIG) --openssldir=/etc/ssl --prefix=/usr $(SSL_TARGET) shared
+ patch -Np1 -i ../$(PATCH1)
+ # FIXME ppc
+ $(CONFIG) --openssldir=/etc/ssl --prefix=/usr shared
ifeq ($(LFS-ARCH),x86)
- sed -i 's/mcpu=pentium/mtune=i486/' Configure
- sed -i 's/mcpu=pentium/mtune=i486/' Makefile
+ sed -i 's/mcpu=pentium/march=i486/' Configure
+ sed -i 's/mcpu=pentium/march=i486/' Makefile
endif
- make $(PM) $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man
- make $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man install
+ make $(PM) MANDIR=/usr/share/man
+ make MANDIR=/usr/share/man install
cp -r certs /etc/ssl
clean:
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
