Updated upstream Git repositories
[opendreambox.git] / meta-opendreambox / recipes-connectivity / openssl / openssl-0.9.8y / shared-libs.patch
1 Upstream-Status: Inappropriate [configuration]
2
3 diff --git a/Makefile.org b/Makefile.org
4 index e87d623..25ff367 100644
5 --- a/Makefile.org
6 +++ b/Makefile.org
7 @@ -355,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
8         @if [ "$(SHLIB_TARGET)" != "" ]; then \
9                 if [ "$(FIPSCANLIB)" = "libfips" ]; then \
10                         $(ARD) libcrypto.a fipscanister.o ; \
11 -                       $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
12 +                       $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
13                         $(AR) libcrypto.a fips/fipscanister.o ; \
14                 else \
15                         if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
16 @@ -373,7 +373,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
17         @if [ "$(SHLIB_TARGET)" != "" ]; then \
18                 shlibdeps=-lcrypto; \
19                 [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
20 -               $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
21 +               $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
22         else \
23                 echo "There's no support for shared libraries on this platform" >&2 ; \
24                 exit 1; \
25 diff --git a/crypto/Makefile b/crypto/Makefile
26 index 6557f2b..a69bf7c 100644
27 --- a/crypto/Makefile
28 +++ b/crypto/Makefile
29 @@ -103,7 +103,7 @@ $(LIB):     $(LIBOBJ)
30  
31  shared: buildinf.h lib subdirs
32         if [ -n "$(SHARED_LIBS)" ]; then \
33 -               (cd ..; $(MAKE) $(SHARED_LIB)); \
34 +               (cd ..; $(MAKE) -e $(SHARED_LIB)); \
35         fi
36  
37  libs:
38 diff --git a/ssl/Makefile b/ssl/Makefile
39 index 5ac3507..77ea2bd 100644
40 --- a/ssl/Makefile
41 +++ b/ssl/Makefile
42 @@ -62,7 +62,7 @@ lib:  $(LIBOBJ)
43  
44  shared: lib
45         if [ -n "$(SHARED_LIBS)" ]; then \
46 -               (cd ..; $(MAKE) $(SHARED_LIB)); \
47 +               (cd ..; $(MAKE) -e $(SHARED_LIB)); \
48         fi
49  
50  files: