diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-03-01 18:46:43 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2010-03-01 18:46:43 +0000 |
commit | 3e49e0c87aab41004f9069a616e282b6d3a801ca (patch) | |
tree | 958db14dc6891dc9d0d2f9c2b851bf53d57a19a8 /package/openssl/patches/169-makefile-ccache_needs_quotes.patch | |
parent | 524303b8492816a7fa95c8f47bcd13e468f5d9ce (diff) | |
download | upstream-3e49e0c87aab41004f9069a616e282b6d3a801ca.tar.gz upstream-3e49e0c87aab41004f9069a616e282b6d3a801ca.tar.bz2 upstream-3e49e0c87aab41004f9069a616e282b6d3a801ca.zip |
openssl: upgrade to 0.9.8m (patch by Peter Wagner)
SVN-Revision: 19939
Diffstat (limited to 'package/openssl/patches/169-makefile-ccache_needs_quotes.patch')
-rw-r--r-- | package/openssl/patches/169-makefile-ccache_needs_quotes.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/openssl/patches/169-makefile-ccache_needs_quotes.patch b/package/openssl/patches/169-makefile-ccache_needs_quotes.patch deleted file mode 100644 index 94b3b783ed..0000000000 --- a/package/openssl/patches/169-makefile-ccache_needs_quotes.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/Makefile.org -+++ b/Makefile.org -@@ -357,7 +357,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHA - $(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 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT - 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 \ ---- a/apps/Makefile -+++ b/apps/Makefile -@@ -153,12 +153,12 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $( - 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 ..; \ |