Author: justin
Date: 2005-09-24 03:02:43 -0600 (Sat, 24 Sep 2005)
New Revision: 745
Modified:
x86/trunk/packages/fonts-dejavu/Makefile
x86/trunk/packages/freefont/Makefile
x86/trunk/packages/freetype/Makefile
x86/trunk/packages/gawk/Makefile
x86/trunk/packages/gcc/Makefile
x86/trunk/packages/gettext/Makefile
x86/trunk/packages/glib2/Makefile
x86/trunk/packages/glibc/Makefile
x86/trunk/packages/gpm/Makefile
x86/trunk/packages/grep/Makefile
Log:
Packages fonts-dejavu to grep - Messages/Logging update.
Modified: x86/trunk/packages/fonts-dejavu/Makefile
===================================================================
--- x86/trunk/packages/fonts-dejavu/Makefile 2005-09-24 08:39:02 UTC (rev
744)
+++ x86/trunk/packages/fonts-dejavu/Makefile 2005-09-24 09:02:43 UTC (rev
745)
@@ -1,5 +1,4 @@
# DejaVu fonts Makefile
-#==============================================================================
NM= dejavu-ttf
VRS= 1.9
@@ -11,29 +10,20 @@
SHA-$(FILE)= 85019c9fb5fb54282dce12d47ad7f6128aaed36a
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
chroot:
- @chroot "$(MP)" $(chenv-blfs) \
+ chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @cp -v ./*.ttf $(LOCATION) >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ cp -v ./*.ttf $(LOCATION)
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/freefont/Makefile
===================================================================
--- x86/trunk/packages/freefont/Makefile 2005-09-24 08:39:02 UTC (rev
744)
+++ x86/trunk/packages/freefont/Makefile 2005-09-24 09:02:43 UTC (rev
745)
@@ -1,5 +1,4 @@
# FreeFont Makefile
-#==============================================================================
NM= freefont
VRS= ttf
@@ -12,33 +11,24 @@
SHA-$(FILE)= bace5fc544871a646b63f94d4902be0fceca0b3e
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
chroot:
- @chroot "$(MP)" $(chenv-blfs) \
+ chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
- @mkdir $(DIR)
- @cd $(DIR) ; unpack ../$(FILE)
- @make -C $(DIR) -f ../Makefile compile-$@
- @make clean
- @touch $@
+ mkdir $(DIR)
+ cd $(DIR) ; unpack ../$(FILE)
+ make -C $(DIR) -f ../Makefile compile-$@
+ make clean
+ touch $@
compile-stage2:
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @cp -v sfd/* $(LOCATION) >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ cp -v sfd/* $(LOCATION)
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/freetype/Makefile
===================================================================
--- x86/trunk/packages/freetype/Makefile 2005-09-24 08:39:02 UTC (rev
744)
+++ x86/trunk/packages/freetype/Makefile 2005-09-24 09:02:43 UTC (rev
745)
@@ -1,5 +1,4 @@
# FreeType Makefile
-#==============================================================================
NM= freetype
VRS= 2.1.10
@@ -10,49 +9,23 @@
SHA-$(FILE)= f9e5c52e466c3e41483d5d6d44b4f3135a9c4b16
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
chroot:
- @chroot "$(MP)" $(chenv-blfs) \
+ chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h
- @CFLAGS="$(CFLAGS) -fno-strict-aliasing" ./configure --prefix=/usr \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h
+ CFLAGS="$(CFLAGS) -fno-strict-aliasing" ./configure --prefix=/usr
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/gawk/Makefile
===================================================================
--- x86/trunk/packages/gawk/Makefile 2005-09-24 08:39:02 UTC (rev 744)
+++ x86/trunk/packages/gawk/Makefile 2005-09-24 09:02:43 UTC (rev 745)
@@ -1,5 +1,4 @@
# Gawk Makefile
-#==============================================================================
NM= gawk
VRS= 3.1.4
@@ -10,65 +9,33 @@
SHA-$(FILE)= d05aad7163b8f49744bff658d1df0d237d9e5125
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
stage1: $(FILE)
- @$(std_build)
- @cp $(SRC)/$(FILE) $(LFSSRC)
+ $(std_build)
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
- @sed -i 's,ISO-8859-8,ISO-8859-1,' po/it.po
- @./configure --prefix=$(WD) --libexecdir=$(WD)/lib \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @make -C po update-gmo >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
+ sed -i 's,ISO-8859-8,ISO-8859-1,' po/it.po
+ ./configure --prefix=$(WD) --libexecdir=$(WD)/lib
+ make $(PM)
+ make -C po update-gmo
+ make install
chroot:
- @chroot "$(MP)" $(chenv-pre-bash) \
+ chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
stage2: Makefile $(FILE)
- @$(std_build)
+ $(std_build)
compile-stage2:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
- @./configure --prefix=/usr --libexecdir=/usr/lib >../$(DIR)[EMAIL
PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/trunk/packages/gcc/Makefile
===================================================================
--- x86/trunk/packages/gcc/Makefile 2005-09-24 08:39:02 UTC (rev 744)
+++ x86/trunk/packages/gcc/Makefile 2005-09-24 09:02:43 UTC (rev 745)
@@ -1,5 +1,4 @@
# Gcc Makefile
-#==============================================================================
NM= gcc
VRS= 4.0.1
@@ -14,111 +13,62 @@
SHA-$(PATCH1)= 04d4b7d68bfd6b362e9b75678584641a2dde7c2f
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
pass1: $(FILE)
- @$(sep_dir_build)
- @$(MAKE) clean
- @cp $(SRC)/$(FILE) $(LFSSRC)/
+ $(sep_dir_build)
+ cp $(SRC)/$(FILE) $(LFSSRC)/
compile-pass1:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
- @../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
+ ../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
--with-local-prefix=$(WD) --disable-nls --enable-shared \
- --enable-languages=c >../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @make $(PM) bootstrap >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @ln -s gcc $(WD)/bin/cc
- @$(OK)
+ --enable-languages=c
+ make $(PM) bootstrap
+ make install
+ ln -s gcc $(WD)/bin/cc
pass2: $(FILE) $(PATCH1)
- @$(sep_dir_build)
- @$(MAKE) clean
- @cp $(SRC)/$(PATCH1) $(LFSSRC)/
+ $(sep_dir_build)
+ cp $(SRC)/$(PATCH1) $(LFSSRC)/
compile-pass2:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
- @cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} && \
+ cd ../$(DIR) ; cp gcc/Makefile.in{,.orig} && \
sed '[EMAIL PROTECTED](^NATIVE_SYSTEM_HEADER_DIR =\)[EMAIL PROTECTED]
$(WD)/[EMAIL PROTECTED]' \
gcc/Makefile.in.orig > gcc/Makefile.in
- @cd ../$(DIR) ; cp gcc/Makefile.in{,.tmp} && \
+ cd ../$(DIR) ; cp gcc/Makefile.in{,.tmp} && \
sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
> gcc/Makefile.in
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
- @../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+ ../$(DIR)/configure --prefix=$(WD) --libexecdir=$(WD)/lib \
--with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \
--enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \
- --disable-libstdcxx-pch >../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
+ --disable-libstdcxx-pch
+ make $(PM)
+ make install
chroot:
- @chroot "$(MP)" $(chenv-pre-bash) \
+ chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
stage2: $(FILE)
- @$(sep_dir_build)
- @$(MAKE) clean
+ $(sep_dir_build)
compile-stage2:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
- @cd ../$(DIR) ; sed -i 's/install_to_$(INSTALL_DEST) //' \
+ cd ../$(DIR) ; sed -i 's/install_to_$(INSTALL_DEST) //' \
libiberty/Makefile.in
- @cd ../$(DIR) ; sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' \
+ cd ../$(DIR) ; sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' \
gcc/Makefile.in
- @../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
+ ../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
--enable-shared --enable-threads=posix --enable-__cxa_atexit \
- --enable-clocale=gnu --enable-languages=c,c++ >../$(DIR)[EMAIL
PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @ln -sf ../usr/bin/cpp /lib
- @ln -sf gcc /usr/bin/cc
- @$(OK)
+ --enable-clocale=gnu --enable-languages=c,c++
+ make $(PM)
+ make install
+ ln -sf ../usr/bin/cpp /lib
+ ln -sf gcc /usr/bin/cc
clean:
- @-rm -rf $(DIR)
- @-rm -rf $(NM)-build
+ -rm -rf $(DIR)
+ -rm -rf $(NM)-build
.PHONY: compile-pass1 clean chroot compile-pass2 compile-stage2
Modified: x86/trunk/packages/gettext/Makefile
===================================================================
--- x86/trunk/packages/gettext/Makefile 2005-09-24 08:39:02 UTC (rev 744)
+++ x86/trunk/packages/gettext/Makefile 2005-09-24 09:02:43 UTC (rev 745)
@@ -1,5 +1,4 @@
# Gettext Makefile
-#==============================================================================
NM= gettext
VRS= 0.14.5
@@ -10,81 +9,31 @@
SHA-$(FILE)= eaea6cb53693cca785831b98c6d7359423d33e6e
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
stage1: $(FILE)
- @$(std_build)
- @cp $(SRC)/$(FILE) $(LFSSRC)
+ $(std_build)
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=$(WD) --disable-libasprintf --without-csharp \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
+ ./configure --prefix=$(WD) --disable-libasprintf --without-csharp
+ make
+ make install
chroot:
- @chroot "$(MP)" $(chenv-pre-bash) \
+ chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
stage2: Makefile $(FILE)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr
+ make
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/trunk/packages/glib2/Makefile
===================================================================
--- x86/trunk/packages/glib2/Makefile 2005-09-24 08:39:02 UTC (rev 744)
+++ x86/trunk/packages/glib2/Makefile 2005-09-24 09:02:43 UTC (rev 745)
@@ -1,5 +1,4 @@
# Glib Makefile
-#==============================================================================
NM= glib
VRS= 2.6.6
@@ -10,47 +9,22 @@
SHA-$(FILE)= 6bb8860bd29a83964ee66ad53ae3e4950aa2677f
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
chroot:
- @chroot "$(MP)" $(chenv-blfs) \
+ chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/glibc/Makefile
===================================================================
--- x86/trunk/packages/glibc/Makefile 2005-09-24 08:39:02 UTC (rev 744)
+++ x86/trunk/packages/glibc/Makefile 2005-09-24 09:02:43 UTC (rev 745)
@@ -1,5 +1,4 @@
# Glibc Makefile
-#==============================================================================
NM= glibc
VRS= 2.3.5
@@ -38,99 +37,63 @@
SHA-$(PATCH6)= 32f42c062a3a0bfa651cedf015988537ad88dcaa
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
stage1: $(FILE) $(FILE1) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
- @$(sep_dir_build)
- @$(MAKE) clean
- @cp
$(SRC)/{$(FILE),$(FILE1),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)}
$(LFSSRC)/
+ $(sep_dir_build)
+ cp
$(SRC)/{$(FILE),$(FILE1),$(PATCH1),$(PATCH2),$(PATCH3),$(PATCH4),$(PATCH5)}
$(LFSSRC)/
compile-stage1:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
ifeq ($(ARCH),sparc)
- @cd ../$(DIR) ; rm -rf nptl*
+ cd ../$(DIR) ; rm -rf nptl*
endif
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) >../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @../$(DIR)/configure --prefix=$(WD) --disable-profile \
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5)
+ ../$(DIR)/configure --prefix=$(WD) --disable-profile \
--enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
- --without-gd --with-headers=$(WD)/include --without-selinux \
- >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @PARALLELMFLAGS="$(PM)" make >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @touch $(WD)/etc/ld.so.conf
- @PARALLELMFLAGS="$(PM)" make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
+ --without-gd --with-headers=$(WD)/include --without-selinux
+ PARALLELMFLAGS="$(PM)" make
+ touch $(WD)/etc/ld.so.conf
+ PARALLELMFLAGS="$(PM)" make install
chroot:
- @chroot "$(MP)" $(chenv-pre-bash) \
+ chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
stage2: $(FILE) $(FILE1) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4) $(PATCH5)
$(PATCH6)
- @$(sep_dir_build)
- @$(MAKE) clean
- @cp $(SRC)/$(PATCH6) $(LFSSRC)/
- @touch $@
+ $(sep_dir_build)
+ cp $(SRC)/$(PATCH6) $(LFSSRC)/
+ touch $@
compile-stage2:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
ifeq ($(ARCH),sparc)
- @cd ../$(DIR) ; rm -rf nptl*
+ cd ../$(DIR) ; rm -rf nptl*
endif
- @cd ../$(DIR) ; unpack ../$(FILE1) >../$(DIR)[EMAIL PROTECTED] 2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @cd ../$(DIR) ; patch -Np1 -i ../$(PATCH6) >>../$(DIR)[EMAIL PROTECTED]
2>&1
- @../$(DIR)/configure --prefix=/usr --disable-profile \
- --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc \
- >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @PARALLELMFLAGS="$(PM)" make >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @touch /etc/ld.so.conf
- @PARALLELMFLAGS="$(PM)" make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @PARALLELMFLAGS="$(PM)" make localedata/install-locales \
- >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @make -C ../$(DIR)/linuxthreads/man >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @make -C ../$(DIR)/linuxthreads/man install >>../$(DIR)[EMAIL
PROTECTED] 2>&1
- @cp $(ROOT)/etc/nsswitch.conf /etc
- @cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
- @cp $(ROOT)/etc/ld.so.conf /etc
- @$(OK)
+ cd ../$(DIR) ; unpack ../$(FILE1)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH2)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH3)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH4)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH5)
+ cd ../$(DIR) ; patch -Np1 -i ../$(PATCH6)
+ ../$(DIR)/configure --prefix=/usr --disable-profile \
+ --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
+ PARALLELMFLAGS="$(PM)" make
+ touch /etc/ld.so.conf
+ PARALLELMFLAGS="$(PM)" make install
+ PARALLELMFLAGS="$(PM)" make localedata/install-locales
+ make -C ../$(DIR)/linuxthreads/man
+ make -C ../$(DIR)/linuxthreads/man install
+ cp $(ROOT)/etc/nsswitch.conf /etc
+ cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime
+ cp $(ROOT)/etc/ld.so.conf /etc
clean:
- @-rm -rf $(DIR)
- @-rm -rf $(NM)-build
+ -rm -rf $(DIR)
+ -rm -rf $(NM)-build
.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/trunk/packages/gpm/Makefile
===================================================================
--- x86/trunk/packages/gpm/Makefile 2005-09-24 08:39:02 UTC (rev 744)
+++ x86/trunk/packages/gpm/Makefile 2005-09-24 09:02:43 UTC (rev 745)
@@ -1,5 +1,4 @@
# GPM Makefile
-#==============================================================================
NM= gpm
VRS= 1.20.1
@@ -18,52 +17,26 @@
SHA-$(PATCH2)= 38e2e703ccb57becf8dadd0302f2da313932c4eb
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
chroot:
- @chroot "$(MP)" $(chenv-pre-bash) \
+ chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @patch -Np1 -i ../$(PATCH1)
- @patch -Np1 -i ../$(PATCH2)
- @./configure --prefix=/usr --sysconfdir=/etc \
- --without-curses >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @LDFLAGS="-lm" make >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @cp conf/gpm-root.conf /etc
- @/sbin/ldconfig
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ patch -Np1 -i ../$(PATCH1)
+ patch -Np1 -i ../$(PATCH2)
+ ./configure --prefix=/usr --sysconfdir=/etc --without-curses
+ LDFLAGS="-lm" make
+ make install
+ cp conf/gpm-root.conf /etc
+ /sbin/ldconfig
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/grep/Makefile
===================================================================
--- x86/trunk/packages/grep/Makefile 2005-09-24 08:39:02 UTC (rev 744)
+++ x86/trunk/packages/grep/Makefile 2005-09-24 09:02:43 UTC (rev 745)
@@ -1,5 +1,4 @@
# Grep Makefile
-#==============================================================================
NM= grep
VRS= 2.5.1a
@@ -10,81 +9,31 @@
SHA-$(FILE)= 2cd082775d30be463c0ac674a00595eb56fda22e
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
stage1: $(FILE)
- @$(std_build) # See the scripts/functions file for functions like this
- @cp $(SRC)/$(FILE) $(LFSSRC) # Copy LFS-Base packages to safe location
+ $(std_build) # See the scripts/functions file for functions like this
+ cp $(SRC)/$(FILE) $(LFSSRC) # Copy LFS-Base packages to safe location
compile-stage1:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=$(WD) --disable-perl-regexp \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
+ ./configure --prefix=$(WD) --disable-perl-regexp
+ make $(PM)
+ make install
chroot:
- @chroot "$(MP)" $(chenv-post-bash) \
+ chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=/usr --bindir=/bin >../$(DIR)[EMAIL PROTECTED]
2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr --bindir=/bin
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: compile-stage1 clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
