Author: justin
Date: 2005-12-07 08:55:48 -0700 (Wed, 07 Dec 2005)
New Revision: 1250
Modified:
branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile
branches/6.1.1-newmake/packages/expat/Makefile
branches/6.1.1-newmake/packages/gpm/Makefile
branches/6.1.1-newmake/packages/libxml2/Makefile
branches/6.1.1-newmake/packages/libxslt/Makefile
branches/6.1.1-newmake/packages/links/Makefile
branches/6.1.1-newmake/packages/unzip/Makefile
branches/6.1.1-newmake/packages/xfsprogs/Makefile
Log:
[6.1.1-newmake] Removed leftover sparc64 stuff from package Makefiles.
Modified: branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile 2005-12-07
15:50:57 UTC (rev 1249)
+++ branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile 2005-12-07
15:55:48 UTC (rev 1250)
@@ -25,9 +25,7 @@
patch -Np1 -i ../$(PATCH1)
make install-service-dhcpcd
make install-service-pppoe
-ifneq ($(LFS-ARCH),sparc64)
make install-gpm
-endif
make install-autosshd
install -m754 blfs/init.d/sshd /etc/rc.d/init.d/
install -m754 blfs/init.d/random /etc/rc.d/init.d/
Modified: branches/6.1.1-newmake/packages/expat/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/expat/Makefile 2005-12-07 15:50:57 UTC
(rev 1249)
+++ branches/6.1.1-newmake/packages/expat/Makefile 2005-12-07 15:55:48 UTC
(rev 1250)
@@ -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
make $(PM)
make install
Modified: branches/6.1.1-newmake/packages/gpm/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/gpm/Makefile 2005-12-07 15:50:57 UTC
(rev 1249)
+++ branches/6.1.1-newmake/packages/gpm/Makefile 2005-12-07 15:55:48 UTC
(rev 1250)
@@ -28,7 +28,6 @@
$(std_build)
compile-stage2:
-ifneq ($(LFS-ARCH),sparc64)
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH2)
./configure --prefix=/usr --sysconfdir=/etc --without-curses
@@ -36,7 +35,6 @@
make install
cp conf/gpm-root.conf /etc
/sbin/ldconfig
-endif
clean:
-rm -rf $(DIR)
Modified: branches/6.1.1-newmake/packages/libxml2/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/libxml2/Makefile 2005-12-07 15:50:57 UTC
(rev 1249)
+++ branches/6.1.1-newmake/packages/libxml2/Makefile 2005-12-07 15:55:48 UTC
(rev 1250)
@@ -20,12 +20,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
make $(PM)
make install
Modified: branches/6.1.1-newmake/packages/libxslt/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/libxslt/Makefile 2005-12-07 15:50:57 UTC
(rev 1249)
+++ branches/6.1.1-newmake/packages/libxslt/Makefile 2005-12-07 15:55:48 UTC
(rev 1250)
@@ -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
make $(PM)
make install
Modified: branches/6.1.1-newmake/packages/links/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/links/Makefile 2005-12-07 15:50:57 UTC
(rev 1249)
+++ branches/6.1.1-newmake/packages/links/Makefile 2005-12-07 15:55:48 UTC
(rev 1250)
@@ -20,11 +20,7 @@
$(std_build)
compile-stage2:
-ifeq ($(LFS-ARCH),sparc64)
- ./configure --prefix=/usr
-else
./configure --prefix=/usr --enable-graphics
-endif
make $(PM)
make install
Modified: branches/6.1.1-newmake/packages/unzip/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/unzip/Makefile 2005-12-07 15:50:57 UTC
(rev 1249)
+++ branches/6.1.1-newmake/packages/unzip/Makefile 2005-12-07 15:55:48 UTC
(rev 1250)
@@ -36,16 +36,10 @@
patch -Np1 -i ../$(PATCH2)
patch -Np1 -i ../$(PATCH3)
cp unix/Makefile .
-ifneq ($(LFS-ARCH),x86)
- make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_noasm
-else
make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux
make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_shlibz
-endif
make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK install
-ifeq ($(LFS-ARCH),x86)
cp -d libunzip.so* /usr/lib
-endif
clean:
-rm -rf $(DIR)
Modified: branches/6.1.1-newmake/packages/xfsprogs/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/xfsprogs/Makefile 2005-12-07 15:50:57 UTC
(rev 1249)
+++ branches/6.1.1-newmake/packages/xfsprogs/Makefile 2005-12-07 15:55:48 UTC
(rev 1250)
@@ -21,11 +21,7 @@
compile-stage2:
patch -Np1 -i ../$(DIR)-fix_compile-1.patch
-ifeq ($(LFS-ARCH),sparc64)
- OPTIMIZER="-Os" CC="gcc -m64 $(64FLAGS)" make
-else
OPTIMIZER="-Os" make
-endif
make install
clean:
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
