Author: justin
Date: 2006-07-12 01:29:41 -0600 (Wed, 12 Jul 2006)
New Revision: 1601
Modified:
branches/cross/Makefile
branches/cross/packages/bzip2/Makefile
branches/cross/packages/readline/Makefile
branches/cross/vars/vars.ppc
branches/cross/vars/vars.sparc64
branches/cross/vars/vars.x86
branches/cross/vars/vars.x86_64
Log:
Started removal of LIB_MAYBE64, as for x86_64 and sparc64 only the pure64
builds are needed, even for multilib. Updated readline for CLFS build.
Modified: branches/cross/Makefile
===================================================================
--- branches/cross/Makefile 2006-07-12 07:16:01 UTC (rev 1600)
+++ branches/cross/Makefile 2006-07-12 07:29:41 UTC (rev 1601)
@@ -157,9 +157,9 @@
-install -d $(MP)/var/{opt,cache,lib/{misc,locate},local}
-install -d $(MP)/opt/{bin,doc,include,info}
-install -d $(MP)/opt/{lib,man/man{1,2,3,4,5,6,7,8}}
- -install -d $(MP)/{,usr/{,local},opt}/$(LIB_MAYBE64)
+ -install -d $(MP)/{,usr/{,local},opt}/lib
-install -d /usr/lib/locale
- -ln -s ../lib/locale /usr/$(LIB_MAYBE64)
+ -ln -s ../lib/locale /usr/lib
-mknod -m 600 $(MP)/dev/console c 5 1
-mknod -m 666 $(MP)/dev/null c 1 3
-mknod -m 666 $(MP)/dev/zero c 1 5
@@ -416,7 +416,7 @@
@sed -i "s/Version:.*/Version: $(VERSION)/" $(MP)/boot/boot.msg
endif
@install -m755 scripts/{net-setup,greeting,livecd-login,ll}
$(MP)/usr/bin/
- @sed -e 's|_LINKER_|$(LINKER)|' -e 's|/lib/|/$(LIB_MAYBE64)/|' \
+ @sed -e 's|_LINKER_|$(LINKER)|' \
scripts/shutdown-helper > $(MP)/usr/bin/shutdown-helper
@chmod 755 $(MP)/usr/bin/shutdown-helper
@cp -ra root $(MP)/etc/skel
Modified: branches/cross/packages/bzip2/Makefile
===================================================================
--- branches/cross/packages/bzip2/Makefile 2006-07-12 07:16:01 UTC (rev
1600)
+++ branches/cross/packages/bzip2/Makefile 2006-07-12 07:29:41 UTC (rev
1601)
@@ -16,6 +16,10 @@
URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
SHA-$(PATCH2)= 56a29bf1278f21bc30c72d19e5766bfda5c74e5b
+PATCH3= $(DIR)-remove_tempfile-1.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= 85a939e52ab56e02dd376941f8e3aa6418d1e529
+
# Targets
include $(ROOT)/scripts/functions
@@ -25,44 +29,30 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- make $(PM)
-else
cp Makefile{,.bak}
- sed -e '[EMAIL PROTECTED](all:.*\) [EMAIL PROTECTED]@g' \
- -e 's@/lib\(/\| \|$$\)@/[EMAIL PROTECTED]' Makefile.bak > Makefile
+ sed -e '[EMAIL PROTECTED](all:.*\) [EMAIL PROTECTED]@g' Makefile.orig >
Makefile
make CC="$${CC} $(64FLAGS)" AR="${AR}" RANLIB="${RANLIB}"
-endif
make PREFIX=$(WD) install
chroot:
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
$(std_build)
- cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
+ cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/
compile-stage2:
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH2)
- sed -i '[EMAIL PROTECTED] -d /tmp -p [EMAIL PROTECTED] -p /tmp@' bzdiff
-ifndef CROSS
+ patch -Np1 -i ../$(PATCH3)
make $(PM) -f Makefile-libbz2_so
make clean
make $(PM)
-else
- sed -i -e '[EMAIL PROTECTED](all:.*\) [EMAIL PROTECTED]@g' \
- -e 's@/lib\(/\| \|$$\)@/[EMAIL PROTECTED]' Makefile
- make $(PM) -f Makefile-libbz2_so CC="gcc $(64FLAGS)" \
- CXX="g++ $(64FLAGS)"
- make clean
- make CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)"
-endif
make install
cp -v bzip2-shared /bin/bzip2
- cp -av libbz2.so* /$(LIB_MAYBE64)
- ln -sv ../../$(LIB_MAYBE64)/libbz2.so.1.0 /usr/$(LIB_MAYBE64)/libbz2.so
+ cp -av libbz2.so* /lib
+ ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
rm -v /usr/bin/{bunzip2,bzcat,bzip2}
ln -sv bzip2 /bin/bunzip2
ln -sv bzip2 /bin/bzcat
Modified: branches/cross/packages/readline/Makefile
===================================================================
--- branches/cross/packages/readline/Makefile 2006-07-12 07:16:01 UTC (rev
1600)
+++ branches/cross/packages/readline/Makefile 2006-07-12 07:29:41 UTC (rev
1601)
@@ -8,6 +8,10 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 4b2ee2bc9c6dd1d238c84a58f7e6db173600b850
+PATCH1= $(DIR)-fixes-3.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= f58bbd80c7aed462ab7e97e3ac4eae7cd9d1b835
+
# Targets
include $(ROOT)/scripts/functions
@@ -16,24 +20,20 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
- cp $(SRC)/$(FILE) $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage2:
-ifndef CROSS
+ patch -Np1 -i ../$(PATCH1)
./configure --prefix=/usr --libdir=/lib
-else
- CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
- ./configure --prefix=/usr --libdir=/lib64
-endif
make $(PM) SHLIB_LIBS=-lncurses
make install
- chmod 755 /$(LIB_MAYBE64)/lib{readline,history}.so*
- mv /$(LIB_MAYBE64)/lib{readline,history}.a /usr/$(LIB_MAYBE64)
- rm /$(LIB_MAYBE64)/lib{readline,history}.so
- ln -sf ../../$(LIB_MAYBE64)/libreadline.so.5
/usr/$(LIB_MAYBE64)/libreadline.so
- ln -sf ../../$(LIB_MAYBE64)/libhistory.so.5
/usr/$(LIB_MAYBE64)/libhistory.so
+ chmod 755 /lib/lib{readline,history}.so*
+ mv /lib/lib{readline,history}.a /usr/lib
+ rm /lib/lib{readline,history}.so
+ ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
+ ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so
clean:
-rm -rf $(DIR)
Modified: branches/cross/vars/vars.ppc
===================================================================
--- branches/cross/vars/vars.ppc 2006-07-12 07:16:01 UTC (rev 1600)
+++ branches/cross/vars/vars.ppc 2006-07-12 07:29:41 UTC (rev 1601)
@@ -1,4 +1,3 @@
export VERSION := ppc-1.0.0rc1-1
export CFLAGS := -Os -s
-export LIB_MAYBE64 := lib
LINKER := ld.so.1
Modified: branches/cross/vars/vars.sparc64
===================================================================
--- branches/cross/vars/vars.sparc64 2006-07-12 07:16:01 UTC (rev 1600)
+++ branches/cross/vars/vars.sparc64 2006-07-12 07:29:41 UTC (rev 1601)
@@ -1,12 +1,9 @@
export VERSION := sparc64-1.0.0rc1-1
export CROSS := yes
export CROSS_WD := /cross-tools
-export 32FLAGS := -m32 -mcpu=ultrasparc -mtune=ultrasparc
export 64FLAGS := -m64 -mcpu=ultrasparc -mtune=ultrasparc
export GCCTARGET := -mcpu=ultrasparc -mtune=ultrasparc
export CFLAGS := -Os -s
-export LIB_MAYBE64 := lib64
export CLFS_HOST ?= sparcv9-cross-linux-gnu
export CLFS_TARGET := sparc64-unknown-linux-gnu
-export CLFS_TARGET32 := sparc-unknown-linux-gnu
export WHICH := $(CROSS_WD)/bin/which
Modified: branches/cross/vars/vars.x86
===================================================================
--- branches/cross/vars/vars.x86 2006-07-12 07:16:01 UTC (rev 1600)
+++ branches/cross/vars/vars.x86 2006-07-12 07:29:41 UTC (rev 1601)
@@ -2,6 +2,5 @@
export CROSS_WD := /cross-tools
export 32FLAGS := -march=i486
export CFLAGS := -Os -s
-export LIB_MAYBE64 := lib
export CLFS_HOST ?= i486-cross-linux-gnu
export CLFS_TARGET := i486-pc-linux-gnu
Modified: branches/cross/vars/vars.x86_64
===================================================================
--- branches/cross/vars/vars.x86_64 2006-07-12 07:16:01 UTC (rev 1600)
+++ branches/cross/vars/vars.x86_64 2006-07-12 07:29:41 UTC (rev 1601)
@@ -3,7 +3,6 @@
export 32FLAGS := -m32
export 64FLAGS := -m64
export CFLAGS := -Os -s
-export LIB_MAYBE64 := lib64
export CLFS_HOST ?= x86_64-cross-linux-gnu
export CLFS_TARGET := x86_64-unknown-linux-gnu
export CLFS_TARGET32 := i686-pc-linux-gnu
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
