Author: jim
Date: 2006-02-19 19:43:42 -0700 (Sun, 19 Feb 2006)
New Revision: 1409
Added:
trunk/openssl/openssl-0.9.8a-allow_lib64-2.patch
Modified:
trunk/
Log:
[EMAIL PROTECTED]: jim | 2006-02-19 18:43:03 -0800
Added: openssl-0.9.8a-allow_lib64-2.patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1432
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1450
Added: trunk/openssl/openssl-0.9.8a-allow_lib64-2.patch
===================================================================
--- trunk/openssl/openssl-0.9.8a-allow_lib64-2.patch
(rev 0)
+++ trunk/openssl/openssl-0.9.8a-allow_lib64-2.patch 2006-02-20 02:43:42 UTC
(rev 1409)
@@ -0,0 +1,153 @@
+Submitted By: Jeremy Utley (jeremy at jutley dot org)
+Date: 2006-02-19
+Initial Package Version: 0.9.8a
+Origin: Based on work by Ryan Oliver & Jim Gifford
+Upstream Status: Unknown
+Description: Allows lib{32,64} by adding LIBDIR= to the make line - previous
+patch did not adjust paths in the engines subdirectory - this one takes that
+into account
+
+diff -Naur openssl-0.9.8a/Makefile.org openssl-0.9.8a-new/Makefile.org
+--- openssl-0.9.8a/Makefile.org 2005-07-05 05:14:21.000000000 +0000
++++ openssl-0.9.8a-new/Makefile.org 2006-02-19 23:59:01.000000000 +0000
+@@ -70,6 +70,7 @@
+ TAR= tar
+ TARFLAGS= --no-recursion
+ MAKEDEPPROG=makedepend
++LIBDIR=lib
+
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+@@ -168,7 +169,7 @@
+ CC='${CC}' CFLAG='${CFLAG}' \
+ AS='${CC}' ASFLAG='${CFLAG} -c' \
+ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
+- SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
++ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
+ INSTALL_PREFIX='${INSTALL_PREFIX}' \
+ INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \
+ MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
+@@ -280,7 +281,7 @@
+ libcrypto.pc: Makefile
+ @ ( echo 'prefix=$(INSTALLTOP)'; \
+ echo 'exec_prefix=$${prefix}'; \
+- echo 'libdir=$${exec_prefix}/lib'; \
++ echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ echo 'includedir=$${prefix}/include'; \
+ echo ''; \
+ echo 'Name: OpenSSL-libcrypto'; \
+@@ -293,7 +294,7 @@
+ libssl.pc: Makefile
+ @ ( echo 'prefix=$(INSTALLTOP)'; \
+ echo 'exec_prefix=$${prefix}'; \
+- echo 'libdir=$${exec_prefix}/lib'; \
++ echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ echo 'includedir=$${prefix}/include'; \
+ echo ''; \
+ echo 'Name: OpenSSL'; \
+@@ -306,7 +307,7 @@
+ openssl.pc: Makefile
+ @ ( echo 'prefix=$(INSTALLTOP)'; \
+ echo 'exec_prefix=$${prefix}'; \
+- echo 'libdir=$${exec_prefix}/lib'; \
++ echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ echo 'includedir=$${prefix}/include'; \
+ echo ''; \
+ echo 'Name: OpenSSL'; \
+@@ -456,9 +457,9 @@
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+@@ -473,10 +474,10 @@
+ do \
+ if [ -f "$$i" ]; then \
+ ( echo installing $$i; \
+- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++ cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ $(RANLIB)
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ fi; \
+ done;
+ @set -e; if [ -n "$(SHARED_LIBS)" ]; then \
+@@ -486,22 +487,22 @@
+ if [ -f "$$i" -o -f "$$i.a" ]; then \
+ ( echo installing $$i; \
+ if [ "$(PLATFORM)" != "Cygwin" ]; then \
+- cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- chmod 555
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++ cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 555
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+ else \
+ c=`echo $$i | sed
's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ cp $$c
$(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ chmod 755
$(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new
$(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+- cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++ cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+ fi ); \
+ fi; \
+ done; \
+ ( here="`pwd`"; \
+- cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
++ cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
+ $(MAKE) -f $$here/Makefile HERE="$$here" link-shared );
\
+ if [ "$(INSTALLTOP)" != "/usr" ]; then \
+ echo 'OpenSSL shared libraries have been installed
in:'; \
+@@ -510,12 +511,12 @@
+ sed -e '1,/^$$/d' doc/openssl-shared.txt; \
+ fi; \
+ fi
+- cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc
+- cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc
+- cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
++ cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++ chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
++ cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
++ cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+
+ install_docs:
+ @$(PERL) $(TOP)/util/mkdir-p.pl \
+diff -Naur openssl-0.9.8a/engines/Makefile openssl-0.9.8a-new/engines/Makefile
+--- openssl-0.9.8a/engines/Makefile 2005-06-28 09:10:18.000000000 +0000
++++ openssl-0.9.8a-new/engines/Makefile 2006-02-19 23:58:47.000000000
+0000
+@@ -91,12 +91,12 @@
+ for l in $(LIBNAMES); do \
+ ( echo installing $$l; \
+ if [ "$(PLATFORM)" != "Cygwin" ]; then \
+- cp lib$$l.so
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
++ cp lib$$l.so
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.so.new; \
+ else \
+- cp cyg$$l.dll
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
++ cp cyg$$l.dll
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.so.new; \
+ fi; \
+- chmod 555
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new; \
+- mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.so ); \
++ chmod 555
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.so.new; \
++ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.so.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.so ); \
+ done; \
+ fi
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
