source: scripts/patches/openssl-0.9.7d-allow_lib64.patch@ 0801e7a

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 0801e7a was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move
  • Property mode set to 100644
File size: 5.0 KB
RevLine 
[617118d]1Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
2Date: 2004-10-24
3Initial Package Version: 0.9.7d
4Origin: Ryan Oliver
5Description: 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 ...
10diff -uNr openssl-0.9.7d-orig/Makefile.org openssl-0.9.7d/Makefile.org
11--- openssl-0.9.7d-orig/Makefile.org 2004-03-13 08:33:04.000000000 +1100
12+++ openssl-0.9.7d/Makefile.org 2004-11-04 15:35:27.000000000 +1100
13@@ -71,6 +71,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@@ -302,7 +303,7 @@
22 ( set -x; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
23 lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
24 -compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
25- -install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \
26+ -install_name ${INSTALLTOP}/$(LIBDIR)/lib$$i${SHLIB_EXT} ) || exit 1; \
27 libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \
28 echo "" ; \
29 done
30@@ -580,7 +581,7 @@
31 openssl.pc: Makefile.ssl
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'; \
39@@ -772,13 +773,13 @@
40
41 install: all install_docs
42 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
43- $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
44- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
45+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
46+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
47 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
48 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
49 $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
50 $(INSTALL_PREFIX)$(OPENSSLDIR)/private \
51- $(INSTALL_PREFIX)$(OPENSSLDIR)/lib
52+ $(INSTALL_PREFIX)$(OPENSSLDIR)/$(LIBDIR)
53 @for i in $(EXHEADER) ;\
54 do \
55 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
56@@ -795,10 +796,10 @@
57 do \
58 if [ -f "$$i" ]; then \
59 ( echo installing $$i; \
60- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
61- $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
62- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
63- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
64+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
65+ $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
66+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
67+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
68 fi; \
69 done;
70 @if [ -n "$(SHARED_LIBS)" ]; then \
71@@ -808,22 +809,22 @@
72 if [ -f "$$i" -o -f "$$i.a" ]; then \
73 ( echo installing $$i; \
74 if [ "$(PLATFORM)" != "Cygwin" ]; then \
75- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
76- chmod 555 $(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+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
80+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
81 else \
82 c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
83 cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
84 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
85 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
86- cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
87- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
88- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
89+ cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
90+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
91+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \
92 fi ); \
93 fi; \
94 done; \
95 ( here="`pwd`"; \
96- cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
97+ cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
98 set $(MAKE); \
99 $$1 -f $$here/Makefile link-shared ); \
100 if [ "$(INSTALLTOP)" != "/usr" ]; then \
101@@ -833,8 +834,8 @@
102 sed -e '1,/^$$/d' doc/openssl-shared.txt; \
103 fi; \
104 fi
105- cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
106- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
107+ cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
108+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
109
110 install_docs:
111 @$(PERL) $(TOP)/util/mkdir-p.pl \
Note: See TracBrowser for help on using the repository browser.