Annotation of /trunk/openssl/patches/openssl-0.9.8k-libdir.patch
Parent Directory
| 
Revision Log
Revision 758 -
(hide annotations)
(download)
Wed Apr 22 19:34:06 2009 UTC (15 years, 1 month ago) by niro
File size: 7146 byte(s)
Wed Apr 22 19:34:06 2009 UTC (15 years, 1 month ago) by niro
File size: 7146 byte(s)
removed .orig file from patch
| 1 | niro | 758 | Submitted By: Jeremy Utley (jeremy at jutley dot org) |
| 2 | Date: 2006-05-18 | ||
| 3 | Initial Package Version: 0.9.8b | ||
| 4 | Origin: Based on work by Ryan Oliver & Jim Gifford | ||
| 5 | Upstream Status: Unknown | ||
| 6 | Description: Allows lib{32,64} by adding LIBDIR= to the make line - new OpenSSL | ||
| 7 | introduces changes to engines/Makefile that causes the previous patch to fail. | ||
| 8 | This new patch corrects that. | ||
| 9 | |||
| 10 | diff -Naur openssl-0.9.8b/Makefile.org openssl-0.9.8b-new/Makefile.org | ||
| 11 | --- openssl-0.9.8b/Makefile.org 2006-02-10 08:52:56.000000000 +0000 | ||
| 12 | +++ openssl-0.9.8b-new/Makefile.org 2006-05-19 02:02:41.048137327 +0000 | ||
| 13 | @@ -70,6 +70,7 @@ | ||
| 14 | TAR= tar | ||
| 15 | TARFLAGS= --no-recursion | ||
| 16 | MAKEDEPPROG=makedepend | ||
| 17 | +LIBDIR=lib | ||
| 18 | |||
| 19 | # We let the C compiler driver to take care of .s files. This is done in | ||
| 20 | # order to be excused from maintaining a separate set of architecture | ||
| 21 | @@ -172,7 +173,7 @@ | ||
| 22 | CC='${CC}' CFLAG='${CFLAG}' \ | ||
| 23 | AS='${CC}' ASFLAG='${CFLAG} -c' \ | ||
| 24 | AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ | ||
| 25 | - SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \ | ||
| 26 | + SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \ | ||
| 27 | INSTALL_PREFIX='${INSTALL_PREFIX}' \ | ||
| 28 | INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \ | ||
| 29 | MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ | ||
| 30 | @@ -301,7 +302,7 @@ | ||
| 31 | libcrypto.pc: Makefile | ||
| 32 | @ ( echo 'prefix=$(INSTALLTOP)'; \ | ||
| 33 | echo 'exec_prefix=$${prefix}'; \ | ||
| 34 | - echo 'libdir=$${exec_prefix}/lib'; \ | ||
| 35 | + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ | ||
| 36 | echo 'includedir=$${prefix}/include'; \ | ||
| 37 | echo ''; \ | ||
| 38 | echo 'Name: OpenSSL-libcrypto'; \ | ||
| 39 | @@ -314,7 +315,7 @@ | ||
| 40 | libssl.pc: Makefile | ||
| 41 | @ ( echo 'prefix=$(INSTALLTOP)'; \ | ||
| 42 | echo 'exec_prefix=$${prefix}'; \ | ||
| 43 | - echo 'libdir=$${exec_prefix}/lib'; \ | ||
| 44 | + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ | ||
| 45 | echo 'includedir=$${prefix}/include'; \ | ||
| 46 | echo ''; \ | ||
| 47 | echo 'Name: OpenSSL'; \ | ||
| 48 | @@ -327,7 +328,7 @@ | ||
| 49 | openssl.pc: Makefile | ||
| 50 | @ ( echo 'prefix=$(INSTALLTOP)'; \ | ||
| 51 | echo 'exec_prefix=$${prefix}'; \ | ||
| 52 | - echo 'libdir=$${exec_prefix}/lib'; \ | ||
| 53 | + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ | ||
| 54 | echo 'includedir=$${prefix}/include'; \ | ||
| 55 | echo ''; \ | ||
| 56 | echo 'Name: OpenSSL'; \ | ||
| 57 | @@ -477,9 +478,9 @@ | ||
| 58 | |||
| 59 | install_sw: | ||
| 60 | @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ | ||
| 61 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ | ||
| 62 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ | ||
| 63 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ | ||
| 64 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ | ||
| 65 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ | ||
| 66 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ | ||
| 67 | $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ | ||
| 68 | $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ | ||
| 69 | $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ | ||
| 70 | @@ -494,10 +495,10 @@ | ||
| 71 | do \ | ||
| 72 | if [ -f "$$i" ]; then \ | ||
| 73 | ( echo installing $$i; \ | ||
| 74 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 75 | - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 76 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 77 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ | ||
| 78 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 79 | + $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 80 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 81 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ | ||
| 82 | fi; \ | ||
| 83 | done; | ||
| 84 | @set -e; if [ -n "$(SHARED_LIBS)" ]; then \ | ||
| 85 | @@ -507,22 +508,22 @@ | ||
| 86 | if [ -f "$$i" -o -f "$$i.a" ]; then \ | ||
| 87 | ( echo installing $$i; \ | ||
| 88 | if [ "$(PLATFORM)" != "Cygwin" ]; then \ | ||
| 89 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 90 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 91 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ | ||
| 92 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 93 | + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 94 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ | ||
| 95 | else \ | ||
| 96 | c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ | ||
| 97 | cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ | ||
| 98 | chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ | ||
| 99 | mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ | ||
| 100 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 101 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 102 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ | ||
| 103 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 104 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 105 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ | ||
| 106 | fi ); \ | ||
| 107 | fi; \ | ||
| 108 | done; \ | ||
| 109 | ( here="`pwd`"; \ | ||
| 110 | - cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ | ||
| 111 | + cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \ | ||
| 112 | $(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \ | ||
| 113 | if [ "$(INSTALLTOP)" != "/usr" ]; then \ | ||
| 114 | echo 'OpenSSL shared libraries have been installed in:'; \ | ||
| 115 | @@ -531,12 +532,12 @@ | ||
| 116 | sed -e '1,/^$$/d' doc/openssl-shared.txt; \ | ||
| 117 | fi; \ | ||
| 118 | fi | ||
| 119 | - cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig | ||
| 120 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc | ||
| 121 | - cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig | ||
| 122 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc | ||
| 123 | - cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig | ||
| 124 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc | ||
| 125 | + cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig | ||
| 126 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc | ||
| 127 | + cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig | ||
| 128 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc | ||
| 129 | + cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig | ||
| 130 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc | ||
| 131 | |||
| 132 | install_docs: | ||
| 133 | @$(PERL) $(TOP)/util/mkdir-p.pl \ | ||
| 134 | diff -Naur openssl-0.9.8b/engines/Makefile openssl-0.9.8b-new/engines/Makefile | ||
| 135 | --- openssl-0.9.8b/engines/Makefile 2006-02-04 01:49:34.000000000 +0000 | ||
| 136 | +++ openssl-0.9.8b-new/engines/Makefile 2006-05-19 02:00:52.158523141 +0000 | ||
| 137 | @@ -97,13 +97,13 @@ | ||
| 138 | *DSO_DL*) sfx="sl";; \ | ||
| 139 | *) sfx="bad";; \ | ||
| 140 | esac; \ | ||
| 141 | - cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ | ||
| 142 | + cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ | ||
| 143 | else \ | ||
| 144 | sfx="so"; \ | ||
| 145 | cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ | ||
| 146 | fi; \ | ||
| 147 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ | ||
| 148 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \ | ||
| 149 | + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ | ||
| 150 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \ | ||
| 151 | done; \ | ||
| 152 | fi | ||
| 153 |