Annotation of /trunk/openssl/patches/openssl-0.9.7i-libdir.patch
Parent Directory
| 
Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 5571 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 5571 byte(s)
-import
| 1 | niro | 153 | Submitted By: Jim Gifford (patches at jg555 dot com) |
| 2 | Date: 2005-01-27 | ||
| 3 | Initial Package Version: 0.9.7i | ||
| 4 | Origin: Ryan Oliver | ||
| 5 | Upstream Status: Unknown | ||
| 6 | Description: Allows lib{32,64} by add LIBDIR= to the make line | ||
| 7 | |||
| 8 | --- openssl-0.9.7i/Makefile.org.orig 2005-10-11 20:20:55.000000000 +0000 | ||
| 9 | +++ openssl-0.9.7i/Makefile.org 2006-01-28 03:21:16.000000000 +0000 | ||
| 10 | @@ -71,6 +71,7 @@ | ||
| 11 | TAR= tar | ||
| 12 | TARFLAGS= --no-recursion | ||
| 13 | MAKEDEPPROG=makedepend | ||
| 14 | +LIBDIR=lib | ||
| 15 | |||
| 16 | # We let the C compiler driver to take care of .s files. This is done in | ||
| 17 | # order to be excused from maintaining a separate set of architecture | ||
| 18 | @@ -329,7 +330,7 @@ | ||
| 19 | --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \ | ||
| 20 | lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \ | ||
| 21 | -compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \ | ||
| 22 | - -install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \ | ||
| 23 | + -install_name ${INSTALLTOP}/$(LIBDIR)/lib$$i${SHLIB_EXT} ) || exit 1; \ | ||
| 24 | libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \ | ||
| 25 | echo "" ; \ | ||
| 26 | done | ||
| 27 | @@ -591,7 +592,7 @@ | ||
| 28 | openssl.pc: Makefile | ||
| 29 | @ ( echo 'prefix=$(INSTALLTOP)'; \ | ||
| 30 | echo 'exec_prefix=$${prefix}'; \ | ||
| 31 | - echo 'libdir=$${exec_prefix}/lib'; \ | ||
| 32 | + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ | ||
| 33 | echo 'includedir=$${prefix}/include'; \ | ||
| 34 | echo ''; \ | ||
| 35 | echo 'Name: OpenSSL'; \ | ||
| 36 | @@ -775,8 +776,8 @@ | ||
| 37 | |||
| 38 | install_sw: | ||
| 39 | @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ | ||
| 40 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ | ||
| 41 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ | ||
| 42 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ | ||
| 43 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ | ||
| 44 | $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ | ||
| 45 | $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ | ||
| 46 | $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ | ||
| 47 | @@ -797,14 +798,14 @@ | ||
| 48 | do \ | ||
| 49 | if [ -f "$$i" ]; then \ | ||
| 50 | ( echo installing $$i; \ | ||
| 51 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 52 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 53 | if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ | ||
| 54 | : ; \ | ||
| 55 | else \ | ||
| 56 | - $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 57 | + $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 58 | fi; \ | ||
| 59 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 60 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ | ||
| 61 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 62 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ | ||
| 63 | fi; \ | ||
| 64 | done; | ||
| 65 | @if [ -n "$(SHARED_LIBS)" ]; then \ | ||
| 66 | @@ -814,26 +815,26 @@ | ||
| 67 | if [ -f "$$i" -o -f "$$i.a" ]; then \ | ||
| 68 | ( echo installing $$i; \ | ||
| 69 | if [ "$(PLATFORM)" != "Cygwin" ]; then \ | ||
| 70 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 71 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 72 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new \ | ||
| 73 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ | ||
| 74 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 75 | + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 76 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new \ | ||
| 77 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ | ||
| 78 | sig="$$i.$${HMAC_EXT:-sha1}"; \ | ||
| 79 | if [ -f $$sig ]; then \ | ||
| 80 | echo installing $$sig; \ | ||
| 81 | - cp $$sig $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig.new; \ | ||
| 82 | - chmod 444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig.new; \ | ||
| 83 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig.new \ | ||
| 84 | - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$sig; \ | ||
| 85 | + cp $$sig $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig.new; \ | ||
| 86 | + chmod 444 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig.new; \ | ||
| 87 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig.new \ | ||
| 88 | + $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$sig; \ | ||
| 89 | fi; \ | ||
| 90 | else \ | ||
| 91 | c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ | ||
| 92 | cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ | ||
| 93 | chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ | ||
| 94 | mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ | ||
| 95 | - cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \ | ||
| 96 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \ | ||
| 97 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \ | ||
| 98 | + cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ | ||
| 99 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ | ||
| 100 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ | ||
| 101 | fi ); \ | ||
| 102 | fi; \ | ||
| 103 | done; \ | ||
| 104 | @@ -852,13 +853,13 @@ | ||
| 105 | do \ | ||
| 106 | if [ -f "$$i" ]; then \ | ||
| 107 | ( echo installing $$i; \ | ||
| 108 | - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 109 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ | ||
| 110 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ | ||
| 111 | + cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 112 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ | ||
| 113 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ | ||
| 114 | fi; \ | ||
| 115 | done; | ||
| 116 | - cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig | ||
| 117 | - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc | ||
| 118 | + cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig | ||
| 119 | + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc | ||
| 120 | |||
| 121 | install_docs: | ||
| 122 | @$(PERL) $(TOP)/util/mkdir-p.pl \ |