Author: jhuntwork
Date: 2005-04-17 20:29:23 -0600 (Sun, 17 Apr 2005)
New Revision: 101
Added:
trunk/packages/sharutils/
trunk/packages/sharutils/Makefile
Modified:
trunk/Makefile
trunk/packages/gettext/Makefile
trunk/packages/ncurses/Makefile
Log:
Added sharutils package and adjusted ncurses (Alexander Patrakov)
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-04-18 00:07:09 UTC (rev 100)
+++ trunk/Makefile 2005-04-18 02:29:23 UTC (rev 101)
@@ -161,7 +161,7 @@
@if [ ! -f $(MP)/etc/X11/xorg.conf ] ; then if [ -f /etc/X11/xorg.conf
] ; then cp /etc/X11/xorg.conf $(PKG)/Xorg ; fi ; fi
pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages
ch-glibc ch-re-adjust-toolchain \
- ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc
ch-findutils ch-gawk ch-ncurses \
+ ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc
ch-findutils ch-gawk ch-sharutils ch-ncurses \
ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex
ch-gettext ch-inetutils \
ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
@@ -398,6 +398,10 @@
make -C $(PKG)/$@ chroot
make unmount
+sharutils: prep-chroot
+ make -C $(PKG)/$@ chroot
+ make unmount
+
ncurses: prep-chroot
make -C $(PKG)/$@ chroot
make unmount
@@ -987,6 +991,9 @@
ch-gawk: popdev
make -C $(PKG)/gawk stage2
+ch-sharutils: popdev
+ make -C $(PKG)/sharutils stage2
+
ch-ncurses: popdev
make -C $(PKG)/ncurses stage2
Modified: trunk/packages/gettext/Makefile
===================================================================
--- trunk/packages/gettext/Makefile 2005-04-18 00:07:09 UTC (rev 100)
+++ trunk/packages/gettext/Makefile 2005-04-18 02:29:23 UTC (rev 101)
@@ -18,7 +18,7 @@
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
@if [ ! -f $(WD)/bin/gettext ] ; then tar xjvf $(SRC)/$(FILE) && cd
$(DIR) && \
- ./configure --prefix=$(WD) --disable-libasprintf --without-csharp &&
make -j3 && make install ; fi
+ ./configure --prefix=$(WD) --disable-libasprintf --without-csharp &&
make && make install ; fi
@make clean
chroot:
@@ -31,7 +31,7 @@
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
@if [ ! -f /usr/bin/gettext ] ; then tar xjvf $(SRC)/$(FILE) && cd
$(DIR) && \
- ./configure --prefix=/usr && make -j3 && make install ; fi
+ ./configure --prefix=/usr && make && make install ; fi
@make clean
clean:
Modified: trunk/packages/ncurses/Makefile
===================================================================
--- trunk/packages/ncurses/Makefile 2005-04-18 00:07:09 UTC (rev 100)
+++ trunk/packages/ncurses/Makefile 2005-04-18 02:29:23 UTC (rev 101)
@@ -5,9 +5,9 @@
VRS= 5.4
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-20050320.patch
+PATCH= $(DIR)-20050319-patch.sh
URL= $(FTP)/$(NM)/$(FILE)
-URL1= ftp://invisible-island.net/ncurses/5.4/$(PATCH).gz
+URL1= ftp://invisible-island.net/ncurses/5.4/$(PATCH).bz2
# RULES
@@ -33,10 +33,10 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
- @if [ ! -f $(PATCH) ] ; then $(WGET) $(URL) ; fi
+ @if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
@if [ ! -f /usr/bin/clear ] ; then tar xjvf $(SRC)/$(FILE) && \
- gunzip $(PATCH).gz && cd $(DIR) && \
- patch -Np1 -i ../$(PATCH) && \
+ bunzip2 $(PATCH).bz2 && cd $(DIR) && \
+ sh ../$(PATCH) && \
./configure --prefix=/usr --with-shared --without-debug && \
make sources && make -j3 && make install && chmod 755 /usr/lib/*.5.4
&& \
chmod 644 /usr/lib/libncurses++.a && mv /usr/lib/libncurses.so.5* /lib
&& \
Added: trunk/packages/sharutils/Makefile
===================================================================
--- trunk/packages/sharutils/Makefile 2005-04-18 00:07:09 UTC (rev 100)
+++ trunk/packages/sharutils/Makefile 2005-04-18 02:29:23 UTC (rev 101)
@@ -0,0 +1,30 @@
+# sharutils Makefile
+
+# Package versions
+NM= sharutils
+VRS= 4.3.78
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+URL= http://ftp.gnu.org/gnu/sharutils/REL-4.3.78/$(FILE)
+
+# RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+ @chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+
+stage2:
+ @echo ""
+ @echo "======> Building $(NM) in chroot"
+ @echo ""
+ @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
+ mv $(FILE) $(SRC) ; fi
+ @if [ ! -f /usr/bin/clear ] ; then tar -xjvf $(SRC)/$(FILE) && \
+ ./configure --prefix=/usr && \
+ make -j3 && \
+ make install ; fi
+ @make clean
+
+clean:
+ @-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
