Author: justin
Date: 2005-11-29 19:52:36 -0700 (Tue, 29 Nov 2005)
New Revision: 1192
Added:
branches/dm/packages/expat/vars/
branches/dm/packages/html_tidy/vars/
branches/dm/packages/libxml2/vars/
branches/dm/packages/libxslt/vars/
branches/dm/packages/subversion/vars/
Modified:
branches/dm/Makefile
branches/dm/packages/expat/Makefile
branches/dm/packages/html_tidy/Makefile
branches/dm/packages/libxml2/Makefile
branches/dm/packages/libxslt/Makefile
branches/dm/packages/subversion/Makefile
Log:
Merged r1184 (added libxml2, expat, subversion, docbook-xml, libxslt,
docbook-xsl and html_tidy to x86_64-blfs) from trunk to dm. Makefile needed
adjustments because of conflict.
Modified: branches/dm/Makefile
===================================================================
--- branches/dm/Makefile 2005-11-30 02:52:03 UTC (rev 1191)
+++ branches/dm/Makefile 2005-11-30 02:52:36 UTC (rev 1192)
@@ -347,8 +347,10 @@
endif
x86_64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-nano ch-joe ch-screen
ch-curl \
- ch-zip ch-unzip ch-lynx ch-lfs-bootscripts ch-cpio ch-linux ch-ctags
ch-device-mapper \
- ch-initramfs ch-cdrtools ch-zisofs-tools ch-syslinux
+ ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion
ch-lfs-bootscripts \
+ ch-docbook-xml ch-libxslt ch-docbook-xsl ch-html_tidy cd-LFS-BOOK
ch-squashfs ch-cpio \
+ ch-linux ch-ctags ch-device-mapper ch-initramfs ch-cdrtools
ch-zisofs-tools \
+ ch-syslinux
sparc64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano \
ch-joe ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
Modified: branches/dm/packages/expat/Makefile
===================================================================
--- branches/dm/packages/expat/Makefile 2005-11-30 02:52:03 UTC (rev 1191)
+++ branches/dm/packages/expat/Makefile 2005-11-30 02:52:36 UTC (rev 1192)
@@ -8,6 +8,8 @@
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
SHA-$(FILE)= a05bef2d12056162becb6ac631c31e45acd76ce2
+include $(CROSSVARS)
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,12 +22,7 @@
$(std_build)
compile-stage2:
-ifeq ($(LFS-ARCH),sparc64)
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libdir=/usr/lib64
-else
- ./configure --prefix=/usr
-endif
+ $(ARCH_CC) ./configure --prefix=/usr $(EXTRA_CONF)
make $(PM)
make install
Copied: branches/dm/packages/expat/vars (from rev 1184,
trunk/packages/expat/vars)
Modified: branches/dm/packages/html_tidy/Makefile
===================================================================
--- branches/dm/packages/html_tidy/Makefile 2005-11-30 02:52:03 UTC (rev
1191)
+++ branches/dm/packages/html_tidy/Makefile 2005-11-30 02:52:36 UTC (rev
1192)
@@ -26,7 +26,7 @@
compile-stage2:
sh build/gnuauto/setup.sh
- ./configure --prefix=/usr
+ $(ARCH_CC) ./configure --prefix=/usr $(EXTRA_CONF)
make $(PM)
make install
install -d -m755 /usr/share/doc/tidy
Copied: branches/dm/packages/html_tidy/vars (from rev 1184,
trunk/packages/html_tidy/vars)
Modified: branches/dm/packages/libxml2/Makefile
===================================================================
--- branches/dm/packages/libxml2/Makefile 2005-11-30 02:52:03 UTC (rev
1191)
+++ branches/dm/packages/libxml2/Makefile 2005-11-30 02:52:36 UTC (rev
1192)
@@ -8,6 +8,8 @@
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
SHA-$(FILE)= 3f920523136d51b246569977df70e6893d925dd5
+include $(CROSSVARS)
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,12 +22,7 @@
$(std_build)
compile-stage2:
-ifeq ($(LFS-ARCH),sparc64)
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libdir=/usr/lib64 --with-history
-else
- ./configure --prefix=/usr --with-history
-endif
+ $(ARCH_CC) ./configure --prefix=/usr --with-history $(EXTRA_CONF)
make $(PM)
make install
Copied: branches/dm/packages/libxml2/vars (from rev 1184,
trunk/packages/libxml2/vars)
Modified: branches/dm/packages/libxslt/Makefile
===================================================================
--- branches/dm/packages/libxslt/Makefile 2005-11-30 02:52:03 UTC (rev
1191)
+++ branches/dm/packages/libxslt/Makefile 2005-11-30 02:52:36 UTC (rev
1192)
@@ -20,12 +20,7 @@
$(std_build)
compile-stage2:
-ifeq ($(LFS-ARCH),sparc64)
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libdir=/usr/lib64
-else
- ./configure --prefix=/usr
-endif
+ $(ARCH_CC) ./configure --prefix=/usr $(EXTRA_CONF)
make $(PM)
make install
Copied: branches/dm/packages/libxslt/vars (from rev 1184,
trunk/packages/libxslt/vars)
Modified: branches/dm/packages/subversion/Makefile
===================================================================
--- branches/dm/packages/subversion/Makefile 2005-11-30 02:52:03 UTC (rev
1191)
+++ branches/dm/packages/subversion/Makefile 2005-11-30 02:52:36 UTC (rev
1192)
@@ -20,12 +20,7 @@
$(std_build)
compile-stage2:
-ifeq ($(LFS-ARCH),sparc64)
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libdir=/usr/lib64
-else
- ./configure --prefix=/usr
-endif
+ $(ARCH_CC) ./configure --prefix=/usr $(EXTRA_CONF)
make $(PM)
make install
install -v -d -m755 /usr/share/doc/$(DIR)
Copied: branches/dm/packages/subversion/vars (from rev 1184,
trunk/packages/subversion/vars)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
