Author: thomasp
Date: 2005-12-18 16:43:19 -0700 (Sun, 18 Dec 2005)
New Revision: 1287
Added:
trunk/packages/glibc/glibc-20051107-supported_locales-2.patch
trunk/packages/perl/vars/
trunk/packages/perl/vars/vars.ppc
trunk/packages/perl/vars/vars.sparc64
trunk/packages/perl/vars/vars.x86
trunk/packages/perl/vars/vars.x86_64
trunk/packages/zlib/vars/
trunk/packages/zlib/vars/vars.ppc
trunk/packages/zlib/vars/vars.sparc64
trunk/packages/zlib/vars/vars.x86
trunk/packages/zlib/vars/vars.x86_64
Removed:
trunk/packages/perl/perl-5.8.7-lib64-1.patch
Modified:
trunk/Makefile
trunk/packages/bash/Makefile
trunk/packages/binutils/Makefile
trunk/packages/bzip2/Makefile
trunk/packages/coreutils/Makefile
trunk/packages/flex/Makefile
trunk/packages/gcc/Makefile
trunk/packages/gettext/Makefile
trunk/packages/glibc/Makefile
trunk/packages/html_tidy/Makefile
trunk/packages/iproute2/Makefile
trunk/packages/kbd/Makefile
trunk/packages/less/Makefile
trunk/packages/linux-libc-headers/Makefile
trunk/packages/linux/Makefile
trunk/packages/perl/Makefile
trunk/packages/procps/Makefile
trunk/packages/readline/Makefile
trunk/packages/shadow/Makefile
trunk/packages/sysklogd/Makefile
trunk/packages/sysvinit/Makefile
trunk/packages/texinfo/Makefile
trunk/packages/util-linux/Makefile
trunk/packages/zlib/Makefile
trunk/vars/vars.x86_64
Log:
* Major update for x86_64:
- Brought current with CLFS-SVN-20051215-x86_64 multilib
- Simplified some ifdefs related to lib/lib64
- Uses kernel 2.6.14.3
- Used an updated version of iproute2 to match kernel
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -386,6 +386,9 @@
@touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
@chgrp utmp /var/run/utmp /var/log/lastlog
@chmod 664 /var/run/utmp /var/log/lastlog
+ifdef CROSS
+ @chmod 600 /var/log/btmp
+endif
@mv $(WD)/etc/resolv.conf /etc
popdev:
Modified: trunk/packages/bash/Makefile
===================================================================
--- trunk/packages/bash/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/bash/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -24,11 +24,13 @@
ifndef CROSS
./configure --prefix=$(WD) --without-bash-malloc
else
- cp -p Makefile.in Makefile.in.orig
+ cp Makefile.in Makefile.in.orig
sed "[EMAIL PROTECTED] \$$(Program)@$(LFS_TARGET)-&@g"
Makefile.in.orig > Makefile.in
+ echo "ac_cv_func_setvbuf_reversed=no" >> config.cache
CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
./configure --prefix=$(WD) --with-curses \
- --without-bash-malloc --host=$(LFS_TARGET)
+ --without-bash-malloc --host=$(LFS_TARGET) \
+ --cache-file=config.cache
endif
make
make install
Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/binutils/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -27,6 +27,7 @@
cross: $(DEPS)
$(sep_dir_build)
+ for i in $(DEPS) ; do cp $(SRC)/$$i $(LFSSRC) ; done
compile-cross:
cd ../$(DIR) ; for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ;
done
@@ -34,7 +35,6 @@
--target=$(LFS_TARGET) --with-lib-path=$(WD)/lib \
--disable-nls --enable-shared $(ENABLE-64-BIT-BFD)
make configure-host
- make headers -C bfd
make $(PM)
make install
cp -v ../$(DIR)/include/libiberty.h $(WD)/include
@@ -49,7 +49,6 @@
--target=$(LFS_TARGET) --disable-nls --enable-shared \
$(ENABLE-64-BIT-BFD)
make configure-host
- make headers -C bfd
make $(PM)
make install
Modified: trunk/packages/bzip2/Makefile
===================================================================
--- trunk/packages/bzip2/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/bzip2/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -60,13 +60,8 @@
endif
make install
cp bzip2-shared /bin/bzip2
-ifndef CROSS
- cp -a libbz2.so* /lib
- ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
-else
- cp -a libbz2.so* /lib64
- ln -s ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
-endif
+ cp -a libbz2.so* /$(LIB_MAYBE64)
+ ln -s ../../$(LIB_MAYBE64)/libbz2.so.1.0 /usr/$(LIB_MAYBE64)/libbz2.so
rm /usr/bin/{bunzip2,bzcat,bzip2}
ln -s bzip2 /bin/bunzip2
ln -s bzip2 /bin/bzcat
Modified: trunk/packages/coreutils/Makefile
===================================================================
--- trunk/packages/coreutils/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/coreutils/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -33,7 +33,7 @@
./configure --prefix=$(WD)
else
echo "utils_cv_sys_open_max=1024" >> config.cache
- DEFAULT_POSIX2_VERSION=199209 CC="$${CC} $(64FLAGS)" \
+ CC="$${CC} $(64FLAGS)" \
./configure --prefix=$(WD) --cache-file=config.cache \
--build=$(LFS_HOST) --target=$(LFS_TARGET)
endif
@@ -64,8 +64,7 @@
ifndef CROSS
./configure --prefix=/usr
else
- CC="gcc $(64FLAGS)" DEFAULT_POSIX2_VERSION=199209 \
- ./configure --prefix=/usr
+ CC="gcc $(64FLAGS)" ./configure --prefix=/usr
endif
make $(PM)
make install
Modified: trunk/packages/flex/Makefile
===================================================================
--- trunk/packages/flex/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/flex/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -35,11 +35,7 @@
endif
make $(PM)
make install
-ifndef CROSS
- ln -s libfl.a /usr/lib/libl.a
-else
- ln -s libfl.a /usr/lib64/libl.a
-endif
+ ln -s libfl.a /usr/$(LIB_MAYBE64)/libl.a
echo "#!/bin/sh" > /usr/bin/lex
echo "# Begin /usr/bin/lex" >> /usr/bin/lex
echo "" >> /usr/bin/lex
Modified: trunk/packages/gcc/Makefile
===================================================================
--- trunk/packages/gcc/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/gcc/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -28,6 +28,7 @@
cross-static: $(FILE) $(PATCH1) $(PATCH40) $(PATCH41)
$(sep_dir_build)
+ cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH40),$(PATCH41)} $(LFSSRC)
compile-cross-static:
cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) ; \
@@ -57,12 +58,6 @@
cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} ; \
sed "[EMAIL PROTECTED](^CROSS_SYSTEM_HEADER_DIR =\)[EMAIL PROTECTED]
$(WD)/[EMAIL PROTECTED]" \
gcc/Makefile.in.orig > gcc/Makefile.in
- cd ../$(DIR) ; cp gcc/config/t-slibgcc-elf-ver{,.orig} ; \
- sed '/^SHLIB_LC = /[EMAIL PROTECTED]@@'
gcc/config/t-slibgcc-elf-ver.orig \
- > gcc/config/t-slibgcc-elf-ver
- cd ../$(DIR) ; cp gcc/config/t-libunwind{,.orig} ; \
- sed '/^SHLIB_LC = /[EMAIL PROTECTED]@@' gcc/config/t-libunwind.orig \
- > gcc/config/t-libunwind
cd ../$(DIR) ; cp configure{,.orig} ; \
sed '/FLAGS_FOR_TARGET.*\/lib\//[EMAIL PROTECTED] ]*/lib/@@g'
configure.orig > configure
../$(DIR)/configure --prefix=$(CROSS_WD) --target=$(LFS_TARGET) \
@@ -93,7 +88,7 @@
gcc/Makefile.in.bk2 > gcc/Makefile.in
CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" ../$(DIR)/configure \
--prefix=$(WD) --libdir=$(WD)/$(LIB_MAYBE64) --build=$(LFS_HOST) \
- --host=$(LFS_TARGET) --target=$(LFS_TARGET)
--libexecdir=$(WD)/$(LIB_MAYBE64) \
+ --host=$(LFS_TARGET) --target=$(LFS_TARGET) \
--with-local-prefix=$(WD) --enable-long-long --enable-c99 \
--enable-shared --enable-threads=posix --enable-__cxa_atexit \
--disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch
Modified: trunk/packages/gettext/Makefile
===================================================================
--- trunk/packages/gettext/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/gettext/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -19,18 +19,15 @@
compile-stage1:
ifndef CROSS
cd $(NM)-tools ; ./configure --prefix=$(WD) --disable-shared
+else
+ cd $(NM)-tools ; echo "am_cv_func_working_getline=yes" >> config.cache
+ cd $(NM)-tools ; CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
+ ./configure --prefix=$(WD) --host=$(LFS_TARGET) --disable-shared \
+ --cache-file=config.cache
+endif
cd $(NM)-tools ; make -C lib
cd $(NM)-tools ; make -C src msgfmt
cd $(NM)-tools ; cp -v src/msgfmt $(WD)/bin
-else
- echo "am_cv_func_working_getline=yes" >> config.cache
- CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
- ./configure --prefix=$(WD) --libdir=$(WD)/lib64 \
- --host=$(LFS_TARGET) --disable-libasprintf \
- --without-csharp --cache-file=config.cache
- make
- make install
-endif
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/glibc/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -4,7 +4,7 @@
ifndef CROSS
VRS= 2.3.6
else
-VRS= 20050926
+VRS= 20051107
endif
DIR= $(NM)-$(VRS)
@@ -14,7 +14,7 @@
SHA-$(FILE)= 82d0487419f1bdbf2dee439c344e89d6af47e558
else
URL-$(FILE)= ftp://sources.redhat.com/pub/glibc/snapshots/$(FILE)
-SHA-$(FILE)= 47753ac9e13fd955c77c3e2b2bbb278d009dcbc5
+SHA-$(FILE)= 9c7f190eb9d590a33384a24c3772bd3a13355575
endif
ifndef CROSS
@@ -54,14 +54,16 @@
$(sep_dir_build)
compile-headers:
- CC=gcc ../$(DIR)/configure --prefix=/tools \
+ cd ../$(DIR) ; cp configure{,.orig} ; sed -e 's/3.4/3.[0-9]/g' \
+ configure.orig > configure
+ CC=gcc ../$(DIR)/configure --prefix=$(WD) \
--host=$(LFS_TARGET) --build=$(LFS_HOST) --disable-sanity-checks \
- --enable-kernel=2.6.0 --with-headers=/tools/include \
- --with-binutils=/cross-tools/$(LFS_TARGET)/bin
+ --enable-kernel=2.6.0 --with-headers=$(WD)/include \
+ --with-binutils=$(CROSS_WD)/$(LFS_TARGET)/bin
make install-headers
- install -v -d /tools/include/bits
- cp -v bits/stdio_lim.h /tools/include/bits
- touch /tools/include/gnu/stubs.h
+ install -v -d $(WD)/include/bits
+ cp -v bits/stdio_lim.h $(WD)/include/bits
+ touch $(WD)/include/gnu/stubs.h
cp -v ../$(DIR)/nptl/sysdeps/pthread/pthread.h $(WD)/include
cp -v ../$(DIR)/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
\
$(WD)/include/bits
Added: trunk/packages/glibc/glibc-20051107-supported_locales-2.patch
===================================================================
--- trunk/packages/glibc/glibc-20051107-supported_locales-2.patch
2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/glibc/glibc-20051107-supported_locales-2.patch
2005-12-18 23:43:19 UTC (rev 1287)
@@ -0,0 +1 @@
+link glibc-2.3.6-supported_locales-2.patch
\ No newline at end of file
Property changes on:
trunk/packages/glibc/glibc-20051107-supported_locales-2.patch
___________________________________________________________________
Name: svn:special
+ *
Modified: trunk/packages/html_tidy/Makefile
===================================================================
--- trunk/packages/html_tidy/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/html_tidy/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -12,6 +12,8 @@
URL-$(FILE1)= $(HTTPBLFS)/$(NM)/$(FILE1)
SHA-$(FILE1)= 274dc5093ad53045478ba39accec2c411f14c643
+include $(CROSSVARS)
+
# Targets
include $(ROOT)/scripts/functions
Modified: trunk/packages/iproute2/Makefile
===================================================================
--- trunk/packages/iproute2/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/iproute2/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -1,12 +1,22 @@
# Iproute2 Makefile
NM= iproute2
+ifndef CROSS
DATE= 051007
DIR= $(NM)-$(DATE)
+else
+VRS= 2.6.14
+DATE= 051107
+DIR= $(NM)-$(VRS)-$(DATE)
+endif
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+ifndef CROSS
SHA-$(FILE)= 1da92131ff9ae59b96beb54f769411a1339dd1b9
+else
+SHA-$(FILE)= b7042721179ae912044b66711d54773457846abe
+endif
# Targets
Modified: trunk/packages/kbd/Makefile
===================================================================
--- trunk/packages/kbd/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/kbd/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -57,10 +57,11 @@
endif
ifndef CROSS
./configure
+ make $(PM)
else
CC="gcc $(64FLAGS)" ./configure
+ make $(PM) CC="gcc $(64FLAGS)"
endif
- make $(PM)
make install
# Turkish fixup
cp /usr/share/kbd/consoletrans/cp857_to_uni.trans
/usr/share/kbd/unimaps/cp857.uni
Modified: trunk/packages/less/Makefile
===================================================================
--- trunk/packages/less/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/less/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -29,6 +29,9 @@
endif
make $(PM)
make install
+ifdef CROSS
+ mv /usr/bin/less /bin
+endif
clean:
-rm -rf $(DIR)
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/linux/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -5,28 +5,32 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-
-ifneq ($(LFS-ARCH),sparc64)
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+ifndef CROSS
SHA-$(FILE)= fa23a2508a82d17c414adc00cca4557d331a3393
PATCH1= reiser4-for-2.6.12-3.patch.gz
URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.12/$(PATCH1)
SHA-$(PATCH1)= a56513748661db102d75a576d053f6bd78fd2294
+
+PATCH50= $(NM)-2.6.12.5-utf8_input-2.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= 72b51b7cf6b5eeecf79a07d3778670c64011397c
+
else
-URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= 735bd87eceacba9024b134d7c35f38fd18ef161b
+SHA-$(FILE)= b3700f5b923446f9c8f1beda914e1b0f65d8349e
-PATCH1= reiser4-for-2.6.13-2.broken-out.tar.gz
-URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.13/$(PATCH1)
-SHA-$(PATCH1)= a458ccc431d8835edc89cc09f8188b8d880fd263
+PATCH1= reiser4-for-2.6.14-1.patch.gz
+URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.14/$(PATCH1)
+SHA-$(PATCH1)= 1d44c6bd6cb14ae35cdea973510c8608bd557f39
+
+PATCH50= $(NM)-2.6.14-utf8_input-1.patch
+URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
+SHA-$(PATCH50)= 691a781c8233bcba9457bddbe3b7362bf7f663f7
endif
PATCH2= squashfs2.2-patch
-PATCH50= $(NM)-2.6.12.5-utf8_input-2.patch
-URL-$(PATCH50)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH50)
-SHA-$(PATCH50)= 72b51b7cf6b5eeecf79a07d3778670c64011397c
# Targets
@@ -47,15 +51,8 @@
ifeq ($(LFS-ARCH),x86_64)
if [ ! -d /boot/isolinux ] ; then mkdir /boot/isolinux ; fi
endif
-ifneq ($(LFS-ARCH),sparc64)
zcat ../$(PATCH1) > ../reiser4.patch
patch -Np1 -i ../reiser4.patch
-else
- unpack ../$(PATCH1)
- for i in `cat broken-out/serie` ; do \
- patch -Np1 -i broken-out/$$i.patch ; \
- done
-endif
patch -Np1 -i ../$(PATCH2)
cd $(ROOT) ; make -C $(PKG)/unionfs patch-kernel
patch -Np1 -i ../$(PATCH50)
Modified: trunk/packages/linux-libc-headers/Makefile
===================================================================
--- trunk/packages/linux-libc-headers/Makefile 2005-12-18 23:37:34 UTC (rev
1286)
+++ trunk/packages/linux-libc-headers/Makefile 2005-12-18 23:43:19 UTC (rev
1287)
@@ -39,6 +39,10 @@
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
+ifdef CROSS
+ cp -Rv include/mtd /usr/include
+ cp -Rv include/scsi /usr/include
+endif
chown -R root:root /usr/include
find /usr/include -type d -exec chmod 755 {} \;
find /usr/include -type f -exec chmod 644 {} \;
Modified: trunk/packages/perl/Makefile
===================================================================
--- trunk/packages/perl/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/perl/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -12,51 +12,59 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= e515154714acdbb1dbdbeb71727649895e26f50d
-PATCH40= $(DIR)-lib64-1.patch
+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)
cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage1:
patch -Np1 -i ../$(PATCH1)
-ifdef CROSS
- sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]'
hints/linux.sh
- patch -Np1 -i ../$(PATCH40)
- chmod u+w hints/linux.sh
- echo "installstyle=\"lib64/perl5\"" >> hints/linux.sh
-endif
- ./configure.gnu --prefix=$(WD) -Dstatic_ext='Data/Dumper Fcntl IO POSIX'
+ ./configure.gnu --prefix=$(WD) -Dstatic_ext='Data/Dumper Fcntl IO
POSIX' \
+ $(EXTRA_CONF)
make perl utilities
cp perl pod/pod2man $(WD)/bin
-ifndef CROSS
mkdir -p $(WD)/lib/perl5/$(VRS)
cp -R lib/* $(WD)/lib/perl5/$(VRS)
-else
- mkdir -p $(WD)/lib64/perl5/$(VRS)
- cp -R lib/* $(WD)/lib64/perl5/$(VRS)
-endif
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(STAGE2_DEPS)
$(std_build)
+ifdef CROSS
+ cp $(SRC)/{$(PATCH40),$(PATCH41)} $(LFSSRC)
+endif
compile-stage2:
ifndef CROSS
./configure.gnu --prefix=/usr -Dpager="/usr/bin/less -isR"
else
- sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/[EMAIL PROTECTED]'
hints/linux.sh
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
make
Deleted: trunk/packages/perl/perl-5.8.7-lib64-1.patch
===================================================================
--- trunk/packages/perl/perl-5.8.7-lib64-1.patch 2005-12-18 23:37:34 UTC
(rev 1286)
+++ trunk/packages/perl/perl-5.8.7-lib64-1.patch 2005-12-18 23:43:19 UTC
(rev 1287)
@@ -1,27 +0,0 @@
-diff -Naur perl-5.8.7.orig/Configure perl-5.8.7/Configure
---- perl-5.8.7.orig/Configure 2005-04-20 16:34:37.000000000 +0000
-+++ perl-5.8.7/Configure 2005-06-27 18:38:18.000000000 +0000
-@@ -5930,6 +5930,7 @@
- : The default "style" setting is made in installstyle.U
- case "$installstyle" in
- *lib/perl5*) set dflt privlib lib/$package/$version ;;
-+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
- *) set dflt privlib lib/$version ;;
- esac
- eval $prefixit
-@@ -6433,6 +6434,7 @@
- case "$sitelib" in
- '') case "$installstyle" in
- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
-+ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
- *) dflt=$siteprefix/lib/site_$prog/$version ;;
- esac
- ;;
-@@ -6560,6 +6562,7 @@
- prog=`echo $package | $sed 's/-*[0-9.]*$//'`
- case "$installstyle" in
- *lib/perl5*)
dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
-+ *lib64/perl5*)
dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
- esac
- ;;
Added: trunk/packages/perl/vars/vars.ppc
===================================================================
Added: trunk/packages/perl/vars/vars.sparc64
===================================================================
--- trunk/packages/perl/vars/vars.sparc64 2005-12-18 23:37:34 UTC (rev
1286)
+++ trunk/packages/perl/vars/vars.sparc64 2005-12-18 23:43:19 UTC (rev
1287)
@@ -0,0 +1 @@
+EXTRA_CONF=-Dcc="gcc $(32FLAGS)"
Added: trunk/packages/perl/vars/vars.x86
===================================================================
Added: trunk/packages/perl/vars/vars.x86_64
===================================================================
--- trunk/packages/perl/vars/vars.x86_64 2005-12-18 23:37:34 UTC (rev
1286)
+++ trunk/packages/perl/vars/vars.x86_64 2005-12-18 23:43:19 UTC (rev
1287)
@@ -0,0 +1 @@
+EXTRA_CONF=-Dcc="gcc $(32FLAGS)"
Modified: trunk/packages/procps/Makefile
===================================================================
--- trunk/packages/procps/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/procps/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -25,7 +25,7 @@
make $(PM)
make install
else
- make CC="gcc $(64FLAGS)"
+ make $(PM) CC="gcc $(64FLAGS)"
make install lib64=lib64
endif
Modified: trunk/packages/readline/Makefile
===================================================================
--- trunk/packages/readline/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/readline/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -29,18 +29,11 @@
endif
make $(PM) SHLIB_LIBS=-lncurses
make install
-ifndef CROSS
- chmod 755 /lib/lib{readline,history}.so*
- 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
-else
- chmod 755 /lib64/lib{readline,history}.so*
- mv /lib64/lib{readline,history}.a /usr/lib64
- rm /lib64/lib{readline,history}.so
- ln -sf ../../lib64/libreadline.so.5 /usr/lib64/libreadline.so
- ln -sf ../../lib64/libhistory.so.5 /usr/lib64/libhistory.so
-endif
+ 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
clean:
-rm -rf $(DIR)
Modified: trunk/packages/shadow/Makefile
===================================================================
--- trunk/packages/shadow/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/shadow/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -25,8 +25,8 @@
cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage2:
-ifndef CROSS
patch -Np1 -i ../$(PATCH1)
+ifndef CROSS
./configure --libdir=/lib --enable-shared
else
CC="gcc $(64FLAGS)" ./configure --libdir=/lib64 \
@@ -42,15 +42,9 @@
-e '[EMAIL PROTECTED]@MAIL_CHECK_ENAB no@' \
etc/login.defs > /etc/login.defs
mv /usr/bin/passwd /bin
-ifndef CROSS
- mv /lib/libshadow.*a /usr/lib
- rm /lib/libshadow.so
- ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
-else
- mv /lib64/libshadow.*a /usr/lib64
- rm /lib64/libshadow.so
- ln -sf ../../lib64/libshadow.so.0 /usr/lib64/libshadow.so
-endif
+ mv /$(LIB_MAYBE64)/libshadow.*a /usr/$(LIB_MAYBE64)
+ rm /$(LIB_MAYBE64)/libshadow.so
+ ln -sf ../../$(LIB_MAYBE64)/libshadow.so.0
/usr/$(LIB_MAYBE64)/libshadow.so
mkdir -p /etc/default
pwconv
grpconv
Modified: trunk/packages/sysklogd/Makefile
===================================================================
--- trunk/packages/sysklogd/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/sysklogd/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -36,7 +36,6 @@
else
make $(PM) CC="gcc $(64FLAGS)"
endif
- make $(PM)
make install
cp -ra $(ROOT)/etc/syslog.conf /etc
Modified: trunk/packages/sysvinit/Makefile
===================================================================
--- trunk/packages/sysvinit/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/sysvinit/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -31,7 +31,7 @@
ROOT="" make $(PM) -C src
else
ROOT="" make -C src clobber
- ROOT="" make -C src CC="gcc $(64FLAGS)"
+ ROOT="" make $(PM) -C src CC="gcc $(64FLAGS)"
endif
ROOT="" make -C src install
cp $(ROOT)/etc/inittab /etc
Modified: trunk/packages/texinfo/Makefile
===================================================================
--- trunk/packages/texinfo/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/texinfo/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -26,7 +26,11 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
+ifndef CROSS
./configure --prefix=$(WD)
+else
+ CC="gcc $(64FLAGS)" ./configure --prefix=$(WD)
+endif
make $(PM)
make install
Modified: trunk/packages/util-linux/Makefile
===================================================================
--- trunk/packages/util-linux/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/util-linux/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -34,15 +34,13 @@
compile-stage1:
sed -i 's@/usr/[EMAIL PROTECTED](WD)/[EMAIL PROTECTED]' configure
-ifeq ($(LFS-ARCH),sparc64)
- patch -Np1 -i ../$(PATCH31)
-endif
ifndef CROSS
./configure
make -C lib
make -C mount mount umount
make -C text-utils more
else
+ patch -Np1 -i ../$(PATCH31)
CC="$${CC} $(64FLAGS)" ./configure
make ARCH="" CPU="" -C lib
make ARCH="" CPU="" -C mount mount umount
Modified: trunk/packages/zlib/Makefile
===================================================================
--- trunk/packages/zlib/Makefile 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/packages/zlib/Makefile 2005-12-18 23:43:19 UTC (rev 1287)
@@ -8,6 +8,8 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 967e280f284d02284b0cd8872a8e2e04bfdc7283
+include $(CROSSVARS)
+
# Targets
include $(ROOT)/scripts/functions
@@ -30,35 +32,17 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
- ./configure --prefix=/usr --shared --libdir=/lib
-else
- CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" CFLAGS="${CFLAGS} -fPIC" \
- ./configure --prefix=/usr --shared --libdir=/lib64
-endif
+
+ $(ARCH_CC) $(ARCH_CFLAGS) ./configure --prefix=/usr --shared
--libdir=/$(LIB_MAYBE64)
make $(PM)
make install
-ifndef CROSS
- rm /lib/libz.so
- ln -sf ../../lib/libz.so.$(VRS) /usr/lib/libz.so
-else
- rm /lib64/libz.so
- ln -sf ../../lib64/libz.so.$(VRS) /usr/lib64/libz.so
-endif
+ rm /$(LIB_MAYBE64)/libz.so
+ ln -sf ../../$(LIB_MAYBE64)/libz.so.$(VRS) /usr/$(LIB_MAYBE64)/libz.so
make clean
-ifndef CROSS
- ./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" ./configure \
- --prefix=/usr --libdir=/usr/lib64
-endif
+ $(ARCH_CC) ./configure --prefix=/usr $(EXTRA_CONF)
make $(PM)
make install
-ifndef CROSS
- chmod 644 /usr/lib/libz.a
-else
- chmod 644 /usr/lib64/libz.a
-endif
+ chmod 644 /usr/$(LIB_MAYBE64)/libz.a
clean:
-rm -rf $(DIR)
Added: trunk/packages/zlib/vars/vars.ppc
===================================================================
Added: trunk/packages/zlib/vars/vars.sparc64
===================================================================
--- trunk/packages/zlib/vars/vars.sparc64 2005-12-18 23:37:34 UTC (rev
1286)
+++ trunk/packages/zlib/vars/vars.sparc64 2005-12-18 23:43:19 UTC (rev
1287)
@@ -0,0 +1,3 @@
+ARCH_CC=CC="gcc $(64FLAGS)"
+ARCH_CFLAGS=CFLAGS="${CFLAGS} -fPIC"
+EXTRA_CONF="--libdir=/usr/lib64"
Added: trunk/packages/zlib/vars/vars.x86
===================================================================
Added: trunk/packages/zlib/vars/vars.x86_64
===================================================================
--- trunk/packages/zlib/vars/vars.x86_64 2005-12-18 23:37:34 UTC (rev
1286)
+++ trunk/packages/zlib/vars/vars.x86_64 2005-12-18 23:43:19 UTC (rev
1287)
@@ -0,0 +1,3 @@
+ARCH_CC=CC="gcc $(64FLAGS)"
+ARCH_CFLAGS=CFLAGS="${CFLAGS} -fPIC"
+EXTRA_CONF="--libdir=/usr/lib64"
Modified: trunk/vars/vars.x86_64
===================================================================
--- trunk/vars/vars.x86_64 2005-12-18 23:37:34 UTC (rev 1286)
+++ trunk/vars/vars.x86_64 2005-12-18 23:43:19 UTC (rev 1287)
@@ -1,4 +1,5 @@
-export VERSION := x86_64-CRS051009-pre1
+export VERSION := x86_64-CRS051215-pre1
+export KVERS := 2.6.14.3
export CROSS := yes
export CROSS_WD := /cross-tools
export 32FLAGS := -m32
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
