Author: justin
Date: 2006-07-12 02:50:35 -0600 (Wed, 12 Jul 2006)
New Revision: 1608
Added:
branches/cross/packages/tree/
Modified:
branches/cross/Makefile
branches/cross/packages/expect/Makefile
branches/cross/packages/file/Makefile
branches/cross/packages/tcl/Makefile
branches/cross/packages/tree/Makefile
Log:
Added tree, updated testsuite package builds.
Modified: branches/cross/Makefile
===================================================================
--- branches/cross/Makefile 2006-07-12 08:43:39 UTC (rev 1607)
+++ branches/cross/Makefile 2006-07-12 08:50:35 UTC (rev 1608)
@@ -230,13 +230,13 @@
tools: clfs-binutils-scpt clfs-gcc-scpt clfs-ncurses-scpt clfs-bash-scpt \
clfs-bzip2-scpt clfs-coreutils-scpt clfs-diffutils-scpt
clfs-findutils-scpt \
- clfs-gawk-scpt stop-here clfs-gettext-scpt clfs-grep-scpt
clfs-gzip-scpt clfs-make-scpt \
+ clfs-gawk-scpt clfs-gettext-scpt clfs-grep-scpt clfs-gzip-scpt
clfs-make-scpt \
clfs-patch-scpt clfs-sed-scpt clfs-tar-scpt clfs-texinfo-scpt \
clfs-util-linux-scpt clfs-wget-scpt
@cp /etc/resolv.conf $(WD)/etc
cross-pre-bash: createfiles clfs-tcl-scpt clfs-expect-scpt clfs-file-scpt \
- clfs-dejagnu-scpt clfs-tree-scpt clfs-perl-scpt ch-linux-headers \
+ clfs-dejagnu-scpt clfs-tree-scpt stop-here clfs-perl-scpt
ch-linux-headers \
ch-glibc adjusting-toolchain ch-binutils ch-gcc ch-coreutils
ch-iana-etc \
ch-m4 ch-bison ch-ncurses ch-procps ch-sed ch-libtool ch-perl
ch-readline \
ch-zlib ch-autoconf ch-automake ch-bash
Modified: branches/cross/packages/expect/Makefile
===================================================================
--- branches/cross/packages/expect/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
+++ branches/cross/packages/expect/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
@@ -21,15 +21,10 @@
cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage1:
+ sed -i '/EXP_LIB_SPEC=/[EMAIL PROTECTED]/[EMAIL PROTECTED]@' configure
patch -Np1 -i ../$(PATCH1)
-ifndef CROSS
./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
- --with-tclinclude=$(WD)/include --with-x=no
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=$(WD) --with-tcl=$(WD)/lib64 \
- --with-tclinclude=$(WD)/include --libdir=$(WD)/lib64 \
- --with-x=no
-endif
+ --with-tclinclude=$(WD)/include
make $(PM)
make SCRIPTS="" install
Modified: branches/cross/packages/file/Makefile
===================================================================
--- branches/cross/packages/file/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
+++ branches/cross/packages/file/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
@@ -12,25 +12,28 @@
include $(ROOT)/scripts/functions
+stage1: $(FILE)
+ $(std_build)
+ cp $(SRC)/$(FILE) $(LFSSRC)
+
+compile-stage1:
+ ./configure --prefix=/tools
+ make $(PM)
+ make install
+
chroot:
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
$(std_build)
- cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libdir=/usr/lib64
-endif
make $(PM)
make install
clean:
-rm -rf $(DIR)
-.PHONY: clean chroot compile-stage2
+.PHONY: compile-stage1 clean chroot compile-stage2
Modified: branches/cross/packages/tcl/Makefile
===================================================================
--- branches/cross/packages/tcl/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
+++ branches/cross/packages/tcl/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
@@ -17,17 +17,12 @@
cp $(SRC)/$(FILE) $(LFSSRC)/
compile-stage1:
- cd unix ; cp configure configure.orig ; sed "s/relid'/relid/"
configure.orig >configure
-ifndef CROSS
+ cd unix ; sed -i "s/relid'/relid/" configure
cd unix ; ./configure --prefix=$(WD)
-else
- cd unix ; sed -i '[EMAIL PROTECTED](prefix)/[EMAIL
PROTECTED](prefix)/[EMAIL PROTECTED]' Makefile.in
- cd unix ; CC="gcc $(64FLAGS)" ./configure --prefix=/tools
--libdir=$(WD)/lib64
-endif
cd unix ; make $(PM)
cd unix ; make install
cd unix ; make install-private-headers
- ln -s tclsh8.4 $(WD)/bin/tclsh
+ ln -sv tclsh8.4 $(WD)/bin/tclsh
clean:
-rm -rf $(DIR)
Copied: branches/cross/packages/tree (from rev 1598,
branches/cross/packages/file)
Modified: branches/cross/packages/tree/Makefile
===================================================================
--- branches/cross/packages/file/Makefile 2006-07-11 13:57:00 UTC (rev
1598)
+++ branches/cross/packages/tree/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
@@ -1,36 +1,26 @@
-# File Makefile
+# Tree Makefile
-NM= file
-VRS= 4.17
+NM= tree
+VRS= 1.5.0
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
+FILE= $(DIR).tgz
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= e03710a3fcb95db6d0ee9cfcdf88c19a5e525ee4
+SHA-$(FILE)= 201fc3a7d37db8c747ba1665370c14228a422015
# Targets
include $(ROOT)/scripts/functions
-chroot:
- chroot "$(MP)" $(chenv-post-bash) \
- 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-
-stage2: Makefile $(FILE)
+stage1: $(FILE)
$(std_build)
cp $(SRC)/$(FILE) $(LFSSRC)
-compile-stage2:
-ifndef CROSS
- ./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libdir=/usr/lib64
-endif
+compile-stage1:
make $(PM)
make install
clean:
-rm -rf $(DIR)
-.PHONY: clean chroot compile-stage2
+.PHONY: clean chroot compile-stage1
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
