Author: jim
Date: 2006-01-27 20:25:53 -0700 (Fri, 27 Jan 2006)
New Revision: 1374
Added:
trunk/openssl/openssl-0.9.7i-allow_lib64-1.patch
Modified:
trunk/
Log:
[EMAIL PROTECTED]: jim | 2006-01-27 19:24:48 -0800
Added: openssl-0.9.7i-allow_lib64-1.patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1384
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1386
Added: trunk/openssl/openssl-0.9.7i-allow_lib64-1.patch
===================================================================
--- trunk/openssl/openssl-0.9.7i-allow_lib64-1.patch
(rev 0)
+++ trunk/openssl/openssl-0.9.7i-allow_lib64-1.patch 2006-01-28 03:25:53 UTC
(rev 1374)
@@ -0,0 +1,122 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-01-27
+Initial Package Version: 0.9.7i
+Origin: Ryan Oliver
+Upstream Status: Unknown
+Description: Allows lib{32,64} by add LIBDIR= to the make line
+
+--- openssl-0.9.7i/Makefile.org.orig 2005-10-11 20:20:55.000000000 +0000
++++ openssl-0.9.7i/Makefile.org 2006-01-28 03:21:16.000000000 +0000
+@@ -71,6 +71,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
+@@ -329,7 +330,7 @@
+ --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
+ lib$$i.a $$libs -all_load -current_version
${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ -compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} |
cut -d. -f1` \
+- -install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1;
\
++ -install_name ${INSTALLTOP}/$(LIBDIR)/lib$$i${SHLIB_EXT} ) ||
exit 1; \
+ libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \
+ echo "" ; \
+ done
+@@ -591,7 +592,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'; \
+@@ -775,8 +776,8 @@
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+@@ -797,14 +798,14 @@
+ do \
+ if [ -f "$$i" ]; then \
+ ( echo installing $$i; \
+- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++ cp $$i
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ if egrep 'define OPENSSL_FIPS'
$(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+ : ; \
+ else \
+- $(RANLIB)
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++ $(RANLIB)
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ fi; \
+- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++ chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ fi; \
+ done;
+ @if [ -n "$(SHARED_LIBS)" ]; then \
+@@ -814,26 +815,26 @@
+ 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; \
+ sig="$$i.$${HMAC_EXT:-sha1}"; \
+ if [ -f $$sig ]; then \
+ echo installing $$sig; \
+- cp $$sig
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig.new; \
+- chmod 444
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig.new; \
+- mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig.new \
+-
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig; \
++ cp $$sig
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig.new; \
++ chmod 444
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig.new; \
++ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig.new \
++
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig; \
+ fi; \
+ else \
+ c=`echo $$i | sed
's/^lib\(.*\)\.dll/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.a
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
+- chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
+- mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new
$(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
++ cp $$i.a
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
++ chmod 644
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
++ mv -f
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \
+ fi ); \
+ fi; \
+ done; \
+@@ -852,13 +853,13 @@
+ do \
+ if [ -f "$$i" ]; then \
+ ( echo installing $$i; \
+- 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; \
+ done;
+- cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.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 \
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
