Author: thomasp
Date: 2005-10-30 16:04:09 -0700 (Sun, 30 Oct 2005)
New Revision: 1018
Added:
trunk/packages/openssl/vars/
trunk/packages/openssl/vars/vars.ppc
trunk/packages/openssl/vars/vars.sparc64
trunk/packages/openssl/vars/vars.x86
trunk/packages/openssl/vars/vars.x86_64
Modified:
trunk/Makefile
trunk/packages/curl/Makefile
trunk/packages/openssl/Makefile
Log:
* Added openssl, wget, reiserfsprogs, nano, joe, screen, curl, zip, unzip and
lynx to x86_64-blfs target
* Simplified openssl commands based on Alexander's suggestions for trimming the
ifdef's. Added patch to pass LIBDIR=lib64 to make for arches that need to
install to lib64
* Added libdir switch to curl, so libcurl gets put in the right place
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-10-30 13:43:00 UTC (rev 1017)
+++ trunk/Makefile 2005-10-30 23:04:09 UTC (rev 1018)
@@ -283,7 +283,8 @@
make ch-yaboot
endif
-x86_64-blfs: ch-lfs-bootscripts ch-squashfs ch-cpio ch-linux ch-ctags
ch-unionfs \
+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-squashfs ch-cpio ch-linux
ch-ctags ch-unionfs \
ch-initramfs ch-cdrtools ch-syslinux
sparc64-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano \
@@ -559,6 +560,7 @@
ifdef CROSS
@find $(PKG) -name "cross*" -exec rm -rf \{} \;
@rm -f $(PKG)/glibc/headers
+ @rm -f adjusting-toolchain
endif
@echo find $(PKG)/binutils/* ! -path '$(PKG)/binutils/vars*' -xtype d
-exec rm -rf \{} \;
@rm -f $(PKG)/wget/prebuild
Modified: trunk/packages/curl/Makefile
===================================================================
--- trunk/packages/curl/Makefile 2005-10-30 13:43:00 UTC (rev 1017)
+++ trunk/packages/curl/Makefile 2005-10-30 23:04:09 UTC (rev 1018)
@@ -20,7 +20,7 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --libdir=/usr/$(LIB_MAYBE64)
make $(PM)
make install
find docs -name "Makefile*" -o -name "*.1" -o -name "*.3" | xargs rm
Modified: trunk/packages/openssl/Makefile
===================================================================
--- trunk/packages/openssl/Makefile 2005-10-30 13:43:00 UTC (rev 1017)
+++ trunk/packages/openssl/Makefile 2005-10-30 23:04:09 UTC (rev 1018)
@@ -12,6 +12,15 @@
URL-$(PATCH1)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 7640f69ecbe701fd4b71e0d0329d9fffbcc52607
+PATCH40= $(DIR)-allow_lib64-1.patch
+URL-$(PATCH40)= http://linuxfromscratch.org/~thomasp/x86_64-livecd/$(PATCH40)
+SHA-$(PATCH40)= 26ce4198986c9c46b8ae2c85918f831f550cee88
+
+include $(CROSSVARS)
+
+CONFIG ?= ./config
+DEPS= $(FILE) $(PATCHES)
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,28 +29,19 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(DEPS)
$(std_build)
compile-stage2:
- patch -Np1 -i ../$(PATCH1)
-ifneq ($(LFS-ARCH),sparc64)
- ./config --openssldir=/etc/ssl --prefix=/usr shared
-ifneq ($(LFS-ARCH),ppc)
+ for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done
+ $(CONFIG) --openssldir=/etc/ssl --prefix=/usr $(SSL_TARGET) shared
+ifeq ($(LFS-ARCH),x86)
sed -i 's/mcpu=pentium/mtune=i486/' Configure
sed -i 's/mcpu=pentium/mtune=i486/' Makefile
endif
-else
- ./Configure --openssldir=/etc/ssl --prefix=/usr linux64-sparcv9 shared
-endif
- make $(PM) MANDIR=/usr/share/man
- make MANDIR=/usr/share/man install
+ make $(PM) $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man
+ make $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man install
cp -r certs /etc/ssl
-ifeq ($(LFS-ARCH),sparc64)
- mv /usr/lib/libcrypto.* /usr/lib64/
- mv /usr/lib/libssl.* /usr/lib64
- ldconfig
-endif
clean:
-rm -rf $(DIR)
Added: trunk/packages/openssl/vars/vars.ppc
===================================================================
--- trunk/packages/openssl/vars/vars.ppc 2005-10-30 13:43:00 UTC (rev
1017)
+++ trunk/packages/openssl/vars/vars.ppc 2005-10-30 23:04:09 UTC (rev
1018)
@@ -0,0 +1 @@
+PATCHES=$(PATCH1)
Added: trunk/packages/openssl/vars/vars.sparc64
===================================================================
--- trunk/packages/openssl/vars/vars.sparc64 2005-10-30 13:43:00 UTC (rev
1017)
+++ trunk/packages/openssl/vars/vars.sparc64 2005-10-30 23:04:09 UTC (rev
1018)
@@ -0,0 +1,4 @@
+PATCHES=$(PATCH1) $(PATCH40)
+CONFIG=./Configure
+SSL_TARGET=linux64-sparcv9
+LIBDIR_OVERRIDE="LIBDIR=lib64"
Added: trunk/packages/openssl/vars/vars.x86
===================================================================
--- trunk/packages/openssl/vars/vars.x86 2005-10-30 13:43:00 UTC (rev
1017)
+++ trunk/packages/openssl/vars/vars.x86 2005-10-30 23:04:09 UTC (rev
1018)
@@ -0,0 +1 @@
+PATCHES=$(PATCH1)
Added: trunk/packages/openssl/vars/vars.x86_64
===================================================================
--- trunk/packages/openssl/vars/vars.x86_64 2005-10-30 13:43:00 UTC (rev
1017)
+++ trunk/packages/openssl/vars/vars.x86_64 2005-10-30 23:04:09 UTC (rev
1018)
@@ -0,0 +1,2 @@
+PATCHES=$(PATCH1) $(PATCH40)
+LIBDIR_OVERRIDE="LIBDIR=lib64"
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
