allow openssl to compile with ccache enabled (#4518)
authorFlorian Fainelli <florian@openwrt.org>
Sat, 11 Apr 2009 16:25:09 +0000 (16:25 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sat, 11 Apr 2009 16:25:09 +0000 (16:25 +0000)
SVN-Revision: 15212

package/openssl/patches/169-makefile-ccache_needs_quotes.patch [new file with mode: 0644]

diff --git a/package/openssl/patches/169-makefile-ccache_needs_quotes.patch b/package/openssl/patches/169-makefile-ccache_needs_quotes.patch
new file mode 100644 (file)
index 0000000..70a0eec
--- /dev/null
@@ -0,0 +1,40 @@
+--- openssl-0.9.8k/Makefile.org        2009-04-06 13:52:21.000000000 +0200
++++ openssl-0.9.8k.patched/Makefile.org        2009-04-06 13:54:04.000000000 +0200
+@@ -357,7 +357,7 @@
+                       $(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; \
+@@ -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 \
+--- openssl-0.9.8k/apps/Makefile       2009-04-06 22:07:06.000000000 +0200
++++ openssl-0.9.8k.patched/apps/Makefile       2009-04-06 22:12:39.000000000 +0200
+@@ -153,7 +153,7 @@
+       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"; \
+@@ -158,7 +158,7 @@
+       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 ..; \