diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-04-11 16:25:09 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-04-11 16:25:09 +0000 |
| commit | 1307d732674903a9e0300ae5a7b4c470535bebc4 (patch) | |
| tree | 3b731afed6fe056689e33ff6fa4176926ca582ae | |
| parent | ae9a275a8e59093bf0c00e11ffda1aa5f3e57a61 (diff) | |
| download | upstream-1307d732674903a9e0300ae5a7b4c470535bebc4.tar.gz upstream-1307d732674903a9e0300ae5a7b4c470535bebc4.tar.bz2 upstream-1307d732674903a9e0300ae5a7b4c470535bebc4.zip | |
allow openssl to compile with ccache enabled (#4518)
SVN-Revision: 15212
| -rw-r--r-- | package/openssl/patches/169-makefile-ccache_needs_quotes.patch | 40 |
1 files changed, 40 insertions, 0 deletions
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 index 0000000000..70a0eec3cd --- /dev/null +++ b/package/openssl/patches/169-makefile-ccache_needs_quotes.patch @@ -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 ..; \ |