Author: justin
Date: 2006-07-12 03:12:34 -0600 (Wed, 12 Jul 2006)
New Revision: 1609
Added:
branches/cross/packages/man/
branches/cross/packages/man/Makefile
Removed:
branches/cross/packages/man-db/
Modified:
branches/cross/Makefile
branches/cross/packages/curl/Makefile
branches/cross/packages/e2fsprogs/Makefile
branches/cross/packages/flex/Makefile
branches/cross/packages/groff/Makefile
branches/cross/packages/inetutils/Makefile
branches/cross/packages/kbd/Makefile
branches/cross/packages/less/Makefile
branches/cross/packages/libtool/Makefile
branches/cross/packages/man-pages/Makefile
branches/cross/packages/mktemp/Makefile
branches/cross/packages/psmisc/Makefile
branches/cross/packages/sysklogd/Makefile
branches/cross/packages/sysvinit/Makefile
Log:
Removed man-db, added man, various build updates and removed last LIB_MAYBE64
variables.
Modified: branches/cross/Makefile
===================================================================
--- branches/cross/Makefile 2006-07-12 08:50:35 UTC (rev 1608)
+++ branches/cross/Makefile 2006-07-12 09:12:34 UTC (rev 1609)
@@ -370,8 +370,7 @@
adjusting-toolchain:
gcc -dumpspecs | \
- perl -pi -e 's@/tools/lib/ld@/lib/[EMAIL PROTECTED];' \
- -e 's@/tools/lib64/ld@/lib64/[EMAIL PROTECTED];' \
+ perl -p -e 's@/tools/lib/ld@/lib/[EMAIL PROTECTED];' \
-e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/ @g;' > \
`dirname $$(gcc --print-libgcc-file-name)`/specs
@touch $@
Modified: branches/cross/packages/curl/Makefile
===================================================================
--- branches/cross/packages/curl/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/curl/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -20,12 +20,12 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr --libdir=/usr/$(LIB_MAYBE64)
+ ./configure --prefix=/usr
make $(PM)
make install
find docs -name "Makefile*" -o -name "*.1" -o -name "*.3" | xargs rm
install -v -d -m755 /usr/share/doc/$(DIR)
- cp -R docs/* /usr/share/doc/$(DIR)
+ cp -v -R docs/* /usr/share/doc/$(DIR)
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/e2fsprogs/Makefile
===================================================================
--- branches/cross/packages/e2fsprogs/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/e2fsprogs/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -1,12 +1,12 @@
# E2fsprogs Makefile
NM= e2fsprogs
-VRS= 1.38
+VRS= 1.39
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= aa8915fe43bc7cf5fba633df7041009ce9981551
+SHA-$(FILE)= c2dad0c9bd76701eafe3804e2a7d072aa198f046
# Targets
@@ -22,16 +22,9 @@
compile-stage2:
mkdir build
-ifndef CROSS
cd build ; ../configure --prefix=/usr --with-root-prefix="" \
--enable-elf-shlibs --disable-evms
cd build ; make
-else
- sed -i '/libdir=.*\/lib/s@/lib@/[EMAIL PROTECTED]' configure
- cd build ; CC="gcc $(64FLAGS)" ../configure --prefix=/usr \
- --with-root-prefix="" --enable-elf-shlibs --disable-evms
- cd build ; make CC="gcc $(64FLAGS)"
-endif
cd build ; make install
cd build ; make install-libs
Modified: branches/cross/packages/flex/Makefile
===================================================================
--- branches/cross/packages/flex/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/flex/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -21,15 +21,10 @@
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
- ln -sfv libfl.a /usr/$(LIB_MAYBE64)/libl.a
+ ln -sv libfl.a /usr/lib/libl.a
echo "#!/bin/sh" > /usr/bin/lex
echo "# Begin /usr/bin/lex" >> /usr/bin/lex
echo "" >> /usr/bin/lex
Modified: branches/cross/packages/groff/Makefile
===================================================================
--- branches/cross/packages/groff/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/groff/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -1,22 +1,13 @@
# Groff Makefile
-# ascii8 and nippon devices exist only for groff-1.18.1.1 as a patch
-# rejected upstream.
-# Do not upgrade this package before Debian does it!
-# http://bugs.debian.org/196762
-
NM= groff
-VRS= 1.18.1.1
+VRS= 1.19.2
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 19c8c83e6ee29dd6041dae0daf1c1d0debd3d32a
+SHA-$(FILE)= cfad99a5c52933a6a9180e394bd94fbaec0ac956
-PATCH= $(DIR)-debian_fixes-1.patch
-URL-$(PATCH)= $(HTTP)/$(NM)/$(PATCH)
-SHA-$(PATCH)= 39fb82b9673523cb2451a0491929693226ea97dd
-
# Targets
include $(ROOT)/scripts/functions
@@ -25,24 +16,17 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE) $(PATCH)
+stage2: Makefile $(FILE)
$(std_build)
- cp $(SRC)/{$(FILE),$(PATCH)} $(LFSSRC)
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
- patch -Np1 -i ../$(PATCH)
- sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
- -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto
-ifndef CROSS
- PAGE=$(pagesize) ./configure --prefix=/usr --enable-multibyte
-else
- PAGE=$(pagesize) CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
- ./configure --prefix=/usr --libdir=/usr/$(LIB_MAYBE64)
--enable-multibyte
-endif
+ PAGE=$(pagesize) ./configure --prefix=/usr
make
make install
- ln -sf eqn /usr/bin/geqn
- ln -sf tbl /usr/bin/gtbl
+ ln -sv soelim /usr/bin/zsoelim
+ ln -sv eqn /usr/bin/geqn
+ ln -sv tbl /usr/bin/gtbl
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/inetutils/Makefile
===================================================================
--- branches/cross/packages/inetutils/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/inetutils/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -31,17 +31,10 @@
compile-stage2:
patch -Np1 -i ../$(PATCH2)
patch -Np1 -i ../$(PATCH1)
-ifndef CROSS
./configure --prefix=/usr --libexecdir=/usr/sbin \
--sysconfdir=/etc --localstatedir=/var \
--disable-logger --disable-syslogd \
--disable-whois --disable-servers
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libexecdir=/usr/sbin --sysconfdir=/etc --localstatedir=/var \
- --disable-logger --disable-syslogd --disable-whois \
- --disable-servers
-endif
make $(PM)
make install
mv /usr/bin/ping /bin
Modified: branches/cross/packages/kbd/Makefile
===================================================================
--- branches/cross/packages/kbd/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/kbd/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -8,32 +8,18 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 65eaae4d98fca3f7ae7dfc9d9cb7c5a432c6475f
-BELARUSIAN_FILE= belarusian-0.3.tar.gz
-URL-$(BELARUSIAN_FILE)= http://www.mova.org/bellinux/$(BELARUSIAN_FILE)
-SHA-$(BELARUSIAN_FILE)= c0026a915fff58cdc3b68bb57de4eec35a220c43
-
-THAI_FILE= thai-console-data_cvs20051001.tar.bz2
-URL-$(THAI_FILE)= http://www.linuxfromscratch.org/~alexander/$(THAI_FILE)
-SHA-$(THAI_FILE)= 2d5e8f4d6cf488987600d455078fe8f5d4199217
-
PATCH1= $(DIR)-backspace-1.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 39e332e42d5145dfc47786dba5eff63cda91d0ba
-PATCH30= $(DIR)-sparc_kbdrate-1.patch
-URL-$(PATCH30)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH30)
-SHA-$(PATCH30)= 3fe2f0e6a311b8a580f09472dae1b1abbbb7ad21
+PATCH2= $(DIR)-sparc_kbdrate-1.patch
+URL-$(PATCH2)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 3fe2f0e6a311b8a580f09472dae1b1abbbb7ad21
PATCH3= $(DIR)-gcc4_fixes-1.patch
URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
SHA-$(PATCH3)= 93ec9885a79ff79088f1533ec52f1a87dae69500
-STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(THAI_FILE) $(PATCH1) $(PATCH3)
-ifeq ($(LFS-ARCH),sparc64)
-STAGE2-DEPS += $(PATCH30)
-endif
-
-
# Targets
include $(ROOT)/scripts/functions
@@ -42,43 +28,22 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(STAGE2-DEPS)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
$(std_build)
- cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH3)} $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH2),$(PATCH3)} $(LFSSRC)
compile-stage2:
- cd .. ; unpack $(BELARUSIAN_FILE) ; unpack $(THAI_FILE)
- zcat ../bellinux/console/keymaps/by2_win.kmap.gz >
data/keymaps/i386/qwerty/by2_win.map
- sed -i -e 's/\(50 = 0x.\)A/\1C/' data/keymaps/i386/qwerty/by2_win.map
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH3)
ifeq ($(LFS-ARCH),sparc64)
- patch -Np1 -i ../$(PATCH30)
+ patch -Np1 -i ../$(PATCH2)
endif
-ifndef CROSS
- ./configure
+ ./configure --datadir=/lib/kbd
make $(PM)
-else
- CC="gcc $(64FLAGS)" ./configure
- make $(PM) CC="gcc $(64FLAGS)"
-endif
make install
- # Turkish fixup
- cp /usr/share/kbd/consoletrans/cp857_to_uni.trans
/usr/share/kbd/unimaps/cp857.uni
- # Thai fonts and keymaps
- gzip ../thai-console-data/consolefonts/*.psf
- install -m644 ../thai-console-data/consolefonts/*.psf.gz
/usr/share/kbd/consolefonts
- install -m644 ../thai-console-data/consoletrans/tis620.acm
/usr/share/kbd/consoletrans/tis620_to_uni.trans
- for a in ../thai-console-data/keymaps/*.kmap \
- ../thai-console-data/keymaps/experimental/*.kmap ; do \
- mv $${a} $${a%kmap}map ; done
- sed -i 's,\+U,U,g' ../thai-console-data/keymaps/experimental/*.map
- gzip ../thai-console-data/keymaps/*.map
../thai-console-data/keymaps/experimental/*.map
- install -m644 ../thai-console-data/keymaps/*.map.gz
../thai-console-data/keymaps/experimental/*uni*.map.gz
/usr/share/kbd/keymaps/i386/qwerty
+ mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin
clean:
-rm -rf $(DIR)
- -rm -rf bellinux
- -rm -rf thai-console-data
.PHONY: clean chroot compile-stage2
Modified: branches/cross/packages/less/Makefile
===================================================================
--- branches/cross/packages/less/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/less/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -21,17 +21,10 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr --sysconfdir=/etc
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --sysconfdir=/etc
-endif
make $(PM)
make install
-ifdef CROSS
mv /usr/bin/less /bin
-endif
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/libtool/Makefile
===================================================================
--- branches/cross/packages/libtool/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/libtool/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -21,12 +21,7 @@
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
Added: branches/cross/packages/man/Makefile
===================================================================
--- branches/cross/packages/man/Makefile (rev 0)
+++ branches/cross/packages/man/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -0,0 +1,33 @@
+# man Makefile
+
+NM= man
+VRS= 1.6d
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= f83aecdcd922f0cf3515665b8e1e0e2514c99286
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+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:
+ sed -i '[EMAIL PROTECTED]@&[EMAIL PROTECTED]' configure
+ sed -i '[EMAIL PROTECTED]/usr/[EMAIL PROTECTED]&@g' src/man.conf.in
+ ./configure -confdir=/etc
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Modified: branches/cross/packages/man-pages/Makefile
===================================================================
--- branches/cross/packages/man-pages/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/man-pages/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -1,12 +1,12 @@
# Man-pages Makefile
NM= man-pages
-VRS= 2.21
+VRS= 2.33
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 36e50c9058d30244afa70e6622baea32ded258a2
+SHA-$(FILE)= dcbcaabdd8d0508b8ca6a766040e35a828680c75
# Targets
Modified: branches/cross/packages/mktemp/Makefile
===================================================================
--- branches/cross/packages/mktemp/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/mktemp/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -26,11 +26,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
-ifndef CROSS
./configure --prefix=/usr --with-libc
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr --with-libc
-endif
make $(PM)
make install
make install-tempfile
Modified: branches/cross/packages/psmisc/Makefile
===================================================================
--- branches/cross/packages/psmisc/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/psmisc/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -21,12 +21,7 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr --exec-prefix=""
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --exec-prefix=""
-endif
make $(PM)
make install
mv -v /bin/pstree* /usr/bin
Modified: branches/cross/packages/sysklogd/Makefile
===================================================================
--- branches/cross/packages/sysklogd/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/sysklogd/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -12,10 +12,6 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 4fbd5e56c212c8e37f363eb48ba86a5ecea21f4a
-PATCH50= $(DIR)-8bit-1.patch
-URL-$(PATCH50)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= edc01eceb4ae7af3d6a02e23a4dace8fee50f3eb
-
# Targets
include $(ROOT)/scripts/functions
@@ -24,18 +20,13 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
- cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH50)} $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage2:
patch -Np1 -i ../$(PATCH1)
- patch -Np1 -i ../$(PATCH50)
-ifndef CROSS
make $(PM)
-else
- make $(PM) CC="gcc $(64FLAGS)"
-endif
make install
cp -ra $(ROOT)/etc/syslog.conf /etc
Modified: branches/cross/packages/sysvinit/Makefile
===================================================================
--- branches/cross/packages/sysvinit/Makefile 2006-07-12 08:50:35 UTC (rev
1608)
+++ branches/cross/packages/sysvinit/Makefile 2006-07-12 09:12:34 UTC (rev
1609)
@@ -8,10 +8,6 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 3e78df609a2ff0fea6304cb662a7f10298d03667
-PATCH1= $(DIR)-reexec06-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= d06fd7274e767c1c98be27d1dc4adb135260e479
-
# Targets
include $(ROOT)/scripts/functions
@@ -20,20 +16,15 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
$(std_build)
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
- patch -Np1 -i ../$(PATCH1)
sed -i '[EMAIL PROTECTED] processes@& started by [EMAIL PROTECTED]'
src/init.c
-ifndef CROSS
- ROOT="" make $(PM) -C src
-else
- ROOT="" make -C src clobber
- ROOT="" make $(PM) -C src CC="gcc $(64FLAGS)"
-endif
- ROOT="" make -C src install
+ make $(PM) -C src clobber
+ make $(PM) -C src
+ make -C src install
cp $(ROOT)/etc/inittab /etc
clean:
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
