r582 - in x86/branches/utf8-newmake: . packages packages/flex packages/fonts-arphic packages/gc packages/imlib packages/w3m

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Aug 22 21:00:46 PDT 2005


Author: alexander
Date: 2005-08-22 22:00:46 -0600 (Mon, 22 Aug 2005)
New Revision: 582

Added:
   x86/branches/utf8-newmake/packages/gc/
   x86/branches/utf8-newmake/packages/gc/Makefile
   x86/branches/utf8-newmake/packages/imlib/
   x86/branches/utf8-newmake/packages/imlib/Makefile
   x86/branches/utf8-newmake/packages/w3m/
   x86/branches/utf8-newmake/packages/w3m/Makefile
Modified:
   x86/branches/utf8-newmake/Makefile
   x86/branches/utf8-newmake/packages/flex/Makefile
   x86/branches/utf8-newmake/packages/fonts-arphic/Makefile
Log:
Fixed mounting /proc and mpoulating /dev when one resumes BLFS build.
Prevented Arphic fonts from being reinstalled each time.
Fixed rebuilding Flex.
Added w3m and its dependencies.


Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile	2005-08-22 01:47:24 UTC (rev 581)
+++ x86/branches/utf8-newmake/Makefile	2005-08-23 04:00:46 UTC (rev 582)
@@ -135,7 +135,6 @@
 	@chroot "$(MP)" $(chenv-post-bash) 'set +h && cd $(ROOT) && \
 	 make post-bash $(chbash-post-bash)'
 	@-ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
-	@touch $@
 
 stop-here:
 	@echo Alexander E. Patrakov has not updated instructions beyond this point.
@@ -207,8 +206,8 @@
 	ch-subversion ch-dialog ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype \
 	ch-fontconfig ch-Xorg ch-inputattach ch-freefont ch-fonts-dejavu \
-	ch-fonts-kochi ch-fonts-arphic update-fontsdir ch-libjpeg ch-libtiff stop-here ch-openssh \
-	ch-glib2 ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 \
+	ch-fonts-kochi ch-fonts-arphic update-fontsdir ch-libjpeg ch-libtiff ch-openssh \
+	ch-glib2 ch-libungif ch-imlib ch-imlib2 ch-gc ch-w3m stop-here ch-pango ch-atk ch-gtk2 \
 	ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
 	ch-startup-notification chroot-gvim ch-xfce ch-lua ch-ion ch-irssi \
 	ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
@@ -433,7 +432,7 @@
 	@-umount $(MP)/sys
 	@rm -f $(ROOT)/prep-chroot
 
-.PHONY: unmount clean_sources scrub clean iso chroot-gvim update-fontsdir \
+.PHONY: lfs-base unmount clean_sources scrub clean iso chroot-gvim update-fontsdir \
 	final-environment re-adjust-toolchain ch-% lfs-adjust-toolchain \
 	lfs-%-scpt lfs-%-pass1 lfs-%-pass2 popdev createfiles createdirs \
 	gvim %-only-ch lfs-%-only lfs-%-only-pass1 lfs-%-only-pass2 lfs-wget \

Modified: x86/branches/utf8-newmake/packages/flex/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/flex/Makefile	2005-08-22 01:47:24 UTC (rev 581)
+++ x86/branches/utf8-newmake/packages/flex/Makefile	2005-08-23 04:00:46 UTC (rev 582)
@@ -52,7 +52,7 @@
 # Install commands below \/
 #==============================================================================
 	@make install >>../$(DIR)-$@.log 2>&1
-	@ln -s libfl.a /usr/lib/libl.a
+	@ln -sf libfl.a /usr/lib/libl.a
 	
 	@echo "#!/bin/sh" > /usr/bin/lex
 	@echo "# Begin /usr/bin/lex" >> /usr/bin/lex

Modified: x86/branches/utf8-newmake/packages/fonts-arphic/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/fonts-arphic/Makefile	2005-08-22 01:47:24 UTC (rev 581)
+++ x86/branches/utf8-newmake/packages/fonts-arphic/Makefile	2005-08-23 04:00:46 UTC (rev 582)
@@ -39,6 +39,7 @@
 #==Status Messages===========================================
 #
 	@$(OK)
+	@touch $@
 
 clean:
 

Added: x86/branches/utf8-newmake/packages/gc/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/gc/Makefile	2005-08-22 01:47:24 UTC (rev 581)
+++ x86/branches/utf8-newmake/packages/gc/Makefile	2005-08-23 04:00:46 UTC (rev 582)
@@ -0,0 +1,56 @@
+# Boehm GC Makefile
+#==============================================================================
+
+NM= gc
+VRS= 6.5
+DIR= $(NM)$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$(FILE)
+SHA-$(FILE)= 1227e4d5d156bdc56ade82043e1d03d2cf35bef5
+
+# Targets
+# =============================================================================
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
+clean:
+	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Added: x86/branches/utf8-newmake/packages/imlib/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/imlib/Makefile	2005-08-22 01:47:24 UTC (rev 581)
+++ x86/branches/utf8-newmake/packages/imlib/Makefile	2005-08-23 04:00:46 UTC (rev 582)
@@ -0,0 +1,58 @@
+# ImLib Makefile
+#==============================================================================
+
+NM= imlib
+VRS= 1.9.15
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://ftp.gnome.org/pub/GNOME/sources/$(NM)/1.9/$(FILE)
+SHA-$(FILE)= c9a732a354fbb3c7e1a426e5d19fc92d73f8f720
+
+# Targets
+# =============================================================================
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --sysconfdir=/etc/imlib >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+	@install -d -m755 /usr/share/doc/$(DIR)
+	@install -m644 doc/{*.gif,index.html} /usr/share/doc/$(DIR)
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
+clean:
+	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Added: x86/branches/utf8-newmake/packages/w3m/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/w3m/Makefile	2005-08-22 01:47:24 UTC (rev 581)
+++ x86/branches/utf8-newmake/packages/w3m/Makefile	2005-08-23 04:00:46 UTC (rev 582)
@@ -0,0 +1,64 @@
+# W3M Makefile
+#==============================================================================
+
+NM= w3m
+VRS= 0.5.1
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/$(NM)/$(FILE)
+SHA-$(FILE)= 7da299648c236772bcde9b0e92e23346c8af0aca
+
+# Targets
+# =============================================================================
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@sed -i 's,Gpm_Open,Gpm_Wgetch,g' configure
+	@./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
+	     --enable-image --with-mailer=/usr/bin/mutt \
+	     --with-browser=/usr/bin/firefox >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+	@install -v -D -m 644 doc/keymap.default /etc/w3m/keymap >>../$(DIR)-$@.log 2>&1
+	@install -v -D -m 644 doc/menu.default /etc/w3m/menu >>../$(DIR)-$@.log 2>&1
+	@install -v -d -m 755 /usr/share/doc/w3m-0.5.1/html >>../$(DIR)-$@.log 2>&1
+	@install -v -m 644 doc/{HISTORY,READM*,keymap.*,menu.*} /usr/share/doc/$(DIR) >>../$(DIR)-$@.log 2>&1
+	@install -v -m 644 doc/*.html /usr/share/doc/$(DIR)/html >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
+clean:
+	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list