shared-libs.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. Index: openssl-0.9.8m/crypto/Makefile
  2. ===================================================================
  3. --- openssl-0.9.8m.orig/crypto/Makefile 2008-09-18 01:10:55.000000000 +0800
  4. +++ openssl-0.9.8m/crypto/Makefile 2010-03-09 16:13:16.055652727 +0800
  5. @@ -103,7 +103,7 @@
  6. shared: buildinf.h lib subdirs
  7. if [ -n "$(SHARED_LIBS)" ]; then \
  8. - (cd ..; $(MAKE) $(SHARED_LIB)); \
  9. + (cd ..; $(MAKE) -e $(SHARED_LIB)); \
  10. fi
  11. libs:
  12. Index: openssl-0.9.8m/Makefile.org
  13. ===================================================================
  14. --- openssl-0.9.8m.orig/Makefile.org 2010-01-28 00:06:36.000000000 +0800
  15. +++ openssl-0.9.8m/Makefile.org 2010-03-09 16:14:22.065664019 +0800
  16. @@ -355,7 +355,7 @@
  17. @if [ "$(SHLIB_TARGET)" != "" ]; then \
  18. if [ "$(FIPSCANLIB)" = "libfips" ]; then \
  19. $(ARD) libcrypto.a fipscanister.o ; \
  20. - $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
  21. + $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
  22. $(AR) libcrypto.a fips/fipscanister.o ; \
  23. else \
  24. if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
  25. @@ -373,7 +373,7 @@
  26. @if [ "$(SHLIB_TARGET)" != "" ]; then \
  27. shlibdeps=-lcrypto; \
  28. [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
  29. - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
  30. + $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
  31. else \
  32. echo "There's no support for shared libraries on this platform" >&2 ; \
  33. exit 1; \
  34. Index: openssl-0.9.8m/ssl/Makefile
  35. ===================================================================
  36. --- openssl-0.9.8m.orig/ssl/Makefile 2010-01-21 00:35:30.000000000 +0800
  37. +++ openssl-0.9.8m/ssl/Makefile 2010-03-09 16:13:16.065664772 +0800
  38. @@ -62,7 +62,7 @@
  39. shared: lib
  40. if [ -n "$(SHARED_LIBS)" ]; then \
  41. - (cd ..; $(MAKE) $(SHARED_LIB)); \
  42. + (cd ..; $(MAKE) -e $(SHARED_LIB)); \
  43. fi
  44. files: