Author: justin
Date: 2006-07-12 02:09:58 -0600 (Wed, 12 Jul 2006)
New Revision: 1604
Modified:
branches/cross/packages/findutils/Makefile
branches/cross/packages/perl/Makefile
Log:
Updated findutils and perl builds.
Modified: branches/cross/packages/findutils/Makefile
===================================================================
--- branches/cross/packages/findutils/Makefile 2006-07-12 08:01:40 UTC (rev
1603)
+++ branches/cross/packages/findutils/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
@@ -17,13 +17,9 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- ./configure --prefix=$(WD)
-else
echo "am_cv_func_working_getline=yes" >> config.cache
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --host=$(LFS_TARGET) --cache-file=config.cache
-endif
+ --build=$(CLFS_HOST) --host=$(LFS_TARGET) --cache-file=config.cache
make $(PM)
make install
@@ -35,13 +31,8 @@
$(std_build)
compile-stage2:
-ifndef CROSS
- ./configure --prefix=/usr --libexecdir=/usr/lib/findutils \
+ ./configure --prefix=/usr --libexecdir=/usr/lib/locate \
--localstatedir=/var/lib/locate
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libexecdir=/usr/lib64/findutils --localstatedir=/var/lib/locate
-endif
make $(PM)
make install
Modified: branches/cross/packages/perl/Makefile
===================================================================
--- branches/cross/packages/perl/Makefile 2006-07-12 08:01:40 UTC (rev
1603)
+++ branches/cross/packages/perl/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
@@ -12,25 +12,10 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= b72468149c5eee6faefde7f32bb05bda6e2a1c9d
-PATCH40= $(DIR)-Configure_multilib-1.patch
-URL-$(PATCH40)= $(HTTP)/$(NM)/$(PATCH40)
-SHA-$(PATCH40)= e2c53f1de5b116f75cfb6c92219012fff9494f78
-
-PATCH41= $(DIR)-libc_lib64-1.patch
-URL-$(PATCH41)= $(HTTP)/$(NM)/$(PATCH41)
-SHA-$(PATCH41)= 111f00a3baadaa4551fdaee3599e95401f81aa53
-
-include $(CROSSVARS)
-
-STAGE2_DEPS = $(FILE)
-
# Targets
include $(ROOT)/scripts/functions
-ifdef CROSS
-STAGE2_DEPS += $(PATCH40) $(PATCH41)
-endif
stage1: $(FILE) $(PATCH1)
$(std_build)
@@ -38,12 +23,12 @@
compile-stage1:
patch -Np1 -i ../$(PATCH1)
- ./configure.gnu --prefix=$(WD) -Dstatic_ext='Data/Dumper Fcntl IO
POSIX' \
- $(EXTRA_CONF)
+ ./configure.gnu --prefix=$(WD) -Dstatic_ext='Data/Dumper IO Fcntl
POSIX' -Dcc="gcc"
make perl utilities
- cp perl pod/pod2man $(WD)/bin
- mkdir -p $(WD)/lib/perl5/$(VRS)
- cp -R lib/* $(WD)/lib/perl5/$(VRS)
+ cp -v perl pod/pod2man $(WD)/bin
+ install -dv $(WD)/lib/perl5/$(VRS)
+ cp -Rv lib/* $(WD)/lib/perl5/$(VRS)
+ ln -sv $(WD)/bin/perl /usr/bin
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
@@ -51,25 +36,11 @@
stage2: Makefile $(STAGE2_DEPS)
$(std_build)
-ifdef CROSS
- cp $(SRC)/{$(PATCH40),$(PATCH41)} $(LFSSRC)
-endif
compile-stage2:
-ifndef CROSS
- ./configure.gnu --prefix=/usr \
- -Dman1dir=/usr/share/man/man1 \
- -Dman1dir=/usr/share/man/man1 \
- -Dpager="/usr/bin/less -isR"
-else
- patch -Np1 -i ../$(PATCH40)
- patch -Np1 -i ../$(PATCH41)
- chmod u+w hints/linux.sh
- echo "installstyle=\"lib64/perl5\"" >> hints/linux.sh
- ./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
- -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
- -Dcc="gcc $(64FLAGS)"
-endif
+ echo "127.0.0.1 localhost $(HOSTNAME)" > /etc/hosts
+ ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \
+ -Dman1dir=/usr/share/man/man1 -Dpager="/bin/less -isR" -Dusethreads
make
make install
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
