aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/openssl/openssl-0.9.8j/shared-libs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/openssl/openssl-0.9.8j/shared-libs.patch')
-rw-r--r--recipes/openssl/openssl-0.9.8j/shared-libs.patch81
1 files changed, 81 insertions, 0 deletions
diff --git a/recipes/openssl/openssl-0.9.8j/shared-libs.patch b/recipes/openssl/openssl-0.9.8j/shared-libs.patch
new file mode 100644
index 0000000000..08b0c7594b
--- /dev/null
+++ b/recipes/openssl/openssl-0.9.8j/shared-libs.patch
@@ -0,0 +1,81 @@
+Index: openssl-0.9.8j/crypto/Makefile
+===================================================================
+--- openssl-0.9.8j.orig/crypto/Makefile 2008-09-17 19:10:55.000000000 +0200
++++ openssl-0.9.8j/crypto/Makefile 2009-01-12 18:25:23.000000000 +0100
+@@ -103,7 +103,7 @@
+
+ shared: buildinf.h lib subdirs
+ if [ -n "$(SHARED_LIBS)" ]; then \
+- (cd ..; $(MAKE) $(SHARED_LIB)); \
++ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
+ fi
+
+ libs:
+Index: openssl-0.9.8j/Makefile.org
+===================================================================
+--- openssl-0.9.8j.orig/Makefile.org 2008-12-30 14:26:26.000000000 +0100
++++ openssl-0.9.8j/Makefile.org 2009-01-12 18:25:55.000000000 +0100
+@@ -353,11 +353,11 @@
+ @if [ "$(SHLIB_TARGET)" != "" ]; then \
+ if [ "$(FIPSCANLIB)" = "libfips" ]; then \
+ $(ARD) libcrypto.a fipscanister.o ; \
+- $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
++ $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
+ $(AR) libcrypto.a fips/fipscanister.o ; \
+ else \
+ if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+- FIPSLD_CC=$(CC); CC=fips/fipsld; \
++ FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+ export CC FIPSLD_CC; \
+ fi; \
+ $(MAKE) -e SHLIBDIRS='crypto' build-shared; \
+@@ -371,7 +371,7 @@
+ @if [ "$(SHLIB_TARGET)" != "" ]; then \
+ shlibdeps=-lcrypto; \
+ [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
+- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
++ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
+ else \
+ echo "There's no support for shared libraries on this platform" >&2 ; \
+ exit 1; \
+@@ -380,7 +380,7 @@
+ fips/fipscanister.o: build_fips
+ libfips$(SHLIB_EXT): fips/fipscanister.o
+ @if [ "$(SHLIB_TARGET)" != "" ]; then \
+- FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \
++ FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \
+ $(MAKE) -f Makefile.shared -e $(BUILDENV) \
+ CC=$${CC} LIBNAME=fips THIS=$@ \
+ LIBEXTRAS=fips/fipscanister.o \
+Index: openssl-0.9.8j/ssl/Makefile
+===================================================================
+--- openssl-0.9.8j.orig/ssl/Makefile 2008-09-17 19:11:09.000000000 +0200
++++ openssl-0.9.8j/ssl/Makefile 2009-01-12 18:25:02.000000000 +0100
+@@ -62,7 +62,7 @@
+
+ shared: lib
+ if [ -n "$(SHARED_LIBS)" ]; then \
+- (cd ..; $(MAKE) $(SHARED_LIB)); \
++ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
+ fi
+
+ files:
+Index: openssl-0.9.8j/apps/Makefile
+===================================================================
+--- openssl-0.9.8j.orig/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
++++ openssl-0.9.8j/apps/Makefile 2009-01-12 18:26:33.000000000 +0100
+@@ -153,12 +153,12 @@
+ shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
+ shlib_target="$(SHLIB_TARGET)"; \
+ elif [ -n "$(FIPSCANLIB)" ]; then \
+- FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
++ FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
+ fi; \
+ LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
+ [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
+ $(MAKE) -f $(TOP)/Makefile.shared -e \
+- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
++ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
+ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+ link_app.$${shlib_target}
+ -(cd ..; \