| [617118d] | 1 | Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au> |
|---|
| 2 | Date: 2005-03-28 |
|---|
| 3 | Initial Package Version: 0.9.7f (need to see if this applies to 0.9.7e) |
|---|
| 4 | Origin: Ryan Oliver |
|---|
| 5 | Description: This patch allows you to alter the default library install |
|---|
| 6 | directory (ie: */lib) to whatever is required (eg: */lib64). |
|---|
| 7 | Adds env var LIBDIR to the openssl Makefile to override the default (lib) |
|---|
| 8 | eg: for a biarch x86_64 system invoke make, make test and make install |
|---|
| 9 | make LIBDIR=lib64 ... |
|---|
| 10 | |
|---|
| 11 | diff -uNr openssl-0.9.7f-orig/Makefile.org openssl-0.9.7f/Makefile.org |
|---|
| 12 | --- openssl-0.9.7f-orig/Makefile.org 2005-03-15 20:46:13.000000000 +1100 |
|---|
| 13 | +++ openssl-0.9.7f/Makefile.org 2005-03-28 16:05:32.000000000 +1000 |
|---|
| 14 | @@ -71,6 +71,7 @@ |
|---|
| 15 | TAR= tar |
|---|
| 16 | TARFLAGS= --no-recursion |
|---|
| 17 | MAKEDEPPROG=makedepend |
|---|
| 18 | +LIBDIR=lib |
|---|
| 19 | |
|---|
| 20 | # We let the C compiler driver to take care of .s files. This is done in |
|---|
| 21 | # order to be excused from maintaining a separate set of architecture |
|---|
| 22 | @@ -324,7 +325,7 @@ |
|---|
| 23 | ( set -x; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \ |
|---|
| 24 | lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \ |
|---|
| 25 | -compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \ |
|---|
| 26 | - -install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \ |
|---|
| 27 | + -install_name ${INSTALLTOP}/$(LIBDIR)/lib$$i${SHLIB_EXT} ) || exit 1; \ |
|---|
| 28 | libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \ |
|---|
| 29 | echo "" ; \ |
|---|
| 30 | done |
|---|
| 31 | @@ -622,7 +623,7 @@ |
|---|
| 32 | openssl.pc: Makefile |
|---|
| 33 | @ ( echo 'prefix=$(INSTALLTOP)'; \ |
|---|
| 34 | echo 'exec_prefix=$${prefix}'; \ |
|---|
| 35 | - echo 'libdir=$${exec_prefix}/lib'; \ |
|---|
| 36 | + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ |
|---|
| 37 | echo 'includedir=$${prefix}/include'; \ |
|---|
| 38 | echo ''; \ |
|---|
| 39 | echo 'Name: OpenSSL'; \ |
|---|
| 40 | @@ -802,8 +803,8 @@ |
|---|
| 41 | |
|---|
| 42 | install_sw: |
|---|
| 43 | @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ |
|---|
| 44 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ |
|---|
| 45 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ |
|---|
| 46 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ |
|---|
| 47 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ |
|---|
| 48 | $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ |
|---|
| 49 | $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ |
|---|
| 50 | $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ |
|---|
| 51 | @@ -824,14 +825,14 @@ |
|---|
| 52 | do \ |
|---|
| 53 | if [ -f "$$i" ]; then \ |
|---|
| 54 | ( echo installing $$i; \ |
|---|
| 55 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ |
|---|
| 56 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ |
|---|
| 57 | if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ |
|---|
| 58 | : ; \ |
|---|
| 59 | else \ |
|---|
| 60 | - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ |
|---|
| 61 | + $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ |
|---|
| 62 | fi; \ |
|---|
| 63 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ |
|---|
| 64 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ |
|---|
| 65 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ |
|---|
| 66 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ |
|---|
| 67 | fi; \ |
|---|
| 68 | done; |
|---|
| 69 | @if [ -n "$(SHARED_LIBS)" ]; then \ |
|---|
| 70 | @@ -841,22 +842,22 @@ |
|---|
| 71 | if [ -f "$$i" -o -f "$$i.a" ]; then \ |
|---|
| 72 | ( echo installing $$i; \ |
|---|
| 73 | if [ "$(PLATFORM)" != "Cygwin" ]; then \ |
|---|
| 74 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ |
|---|
| 75 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ |
|---|
| 76 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ |
|---|
| 77 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ |
|---|
| 78 | + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ |
|---|
| 79 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ |
|---|
| 80 | else \ |
|---|
| 81 | c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ |
|---|
| 82 | cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ |
|---|
| 83 | chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ |
|---|
| 84 | mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ |
|---|
| 85 | - cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \ |
|---|
| 86 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \ |
|---|
| 87 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \ |
|---|
| 88 | + cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ |
|---|
| 89 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ |
|---|
| 90 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ |
|---|
| 91 | fi ); \ |
|---|
| 92 | fi; \ |
|---|
| 93 | done; \ |
|---|
| 94 | ( here="`pwd`"; \ |
|---|
| 95 | - cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ |
|---|
| 96 | + cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \ |
|---|
| 97 | set $(MAKE); \ |
|---|
| 98 | $$1 -f $$here/Makefile link-shared ); \ |
|---|
| 99 | if [ "$(INSTALLTOP)" != "/usr" ]; then \ |
|---|
| 100 | @@ -870,13 +871,13 @@ |
|---|
| 101 | do \ |
|---|
| 102 | if [ -f "$$i" ]; then \ |
|---|
| 103 | ( echo installing $$i; \ |
|---|
| 104 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ |
|---|
| 105 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ |
|---|
| 106 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ |
|---|
| 107 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ |
|---|
| 108 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ |
|---|
| 109 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ |
|---|
| 110 | fi; \ |
|---|
| 111 | done; |
|---|
| 112 | - cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig |
|---|
| 113 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc |
|---|
| 114 | + cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig |
|---|
| 115 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc |
|---|
| 116 | |
|---|
| 117 | install_docs: |
|---|
| 118 | @$(PERL) $(TOP)/util/mkdir-p.pl \ |
|---|
