diff options
Diffstat (limited to 'security/openssl/files/patch-Makefile.org')
| -rw-r--r-- | security/openssl/files/patch-Makefile.org | 62 |
1 files changed, 21 insertions, 41 deletions
diff --git a/security/openssl/files/patch-Makefile.org b/security/openssl/files/patch-Makefile.org index 4cddcac98e37..558434fbd418 100644 --- a/security/openssl/files/patch-Makefile.org +++ b/security/openssl/files/patch-Makefile.org @@ -1,47 +1,27 @@ ---- Makefile.org.orig Fri Mar 12 22:33:04 2004 -+++ Makefile.org Mon Jul 19 06:16:00 2004 -@@ -191,7 +191,7 @@ - MAKEFILE= Makefile.ssl - MAKE= make -f Makefile.ssl +--- Makefile.org.orig Tue Sep 28 22:52:14 2004 ++++ Makefile.org Tue Oct 26 18:08:14 2004 +@@ -194,7 +194,7 @@ + + MAKEFILE= Makefile -MANDIR=$(OPENSSLDIR)/man +MANDIR=$(MANPREFIX)/man MAN1=1 MAN3=3 MANSUFFIX= -@@ -275,6 +275,21 @@ - - build-shared: clean-shared do_$(SHLIB_TARGET) link-shared - -+freebsd-shared: -+ for i in ${SHLIBDIRS}; do \ -+ rm -f lib$$i.a lib$$i.so \ -+ lib$$i.so.${SHLIBVER}; \ -+ ${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' DIRS=$$i clean all || exit 1; \ -+ ( set -x; ${CC} -nodefaultlibs -shared -o lib$$i.so.${SHLIBVER} \ -+ -Wl,-S,-soname=lib$$i.so.${SHLIBVER} \ -+ -Wl,${WHOLE_ARCHIVE_FLAG} lib$$i.a ) || exit 1; \ -+ rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\ -+ done; -+ @set -x; \ -+ for i in ${SHLIBDIRS}; do \ -+ ln -s lib$$i.so.${SHLIBVER} lib$$i.so; \ -+ done; -+ - do_bsd-gcc-shared: do_gnu-shared - do_linux-shared: do_gnu-shared - do_gnu-shared: -@@ -596,7 +611,7 @@ - @false - - libclean: -- rm -f *.map *.so *.so.* engines/*.so *.a */lib */*/lib -+ rm -f *.map *.So *.So.* engines/*.so *.a */lib */*/lib - - clean: libclean - rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c -@@ -773,7 +788,7 @@ - install: all install_docs +@@ -305,8 +305,8 @@ + libs="$(LIBKRB5) $$libs"; \ + fi; \ + ( set -x; ${CC} ${SHARED_LDFLAGS} \ +- -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +- -Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ ++ -shared -o lib$$i.so.${SHLIBVER} \ ++ -Wl,-soname=lib$$i.so.${SHLIBVER} \ + -Wl,-Bsymbolic \ + -Wl,--whole-archive lib$$i.a \ + -Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \ +@@ -795,7 +795,7 @@ + install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ - $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ @@ -49,10 +29,10 @@ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ -@@ -833,8 +848,8 @@ - sed -e '1,/^$$/d' doc/openssl-shared.txt; \ +@@ -867,8 +867,8 @@ + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ fi; \ - 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)/libdata/pkgconfig |