base-files: fix enter failsafe message
[openwrt-10.03/.git] / package / openssl / patches / 169-makefile-ccache_needs_quotes.patch
1 --- a/Makefile.org
2 +++ b/Makefile.org
3 @@ -357,7 +357,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHA
4                         $(AR) libcrypto.a fips/fipscanister.o ; \
5                 else \
6                         if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
7 -                               FIPSLD_CC=$(CC); CC=fips/fipsld; \
8 +                               FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
9                                 export CC FIPSLD_CC; \
10                         fi; \
11                         $(MAKE) -e SHLIBDIRS='crypto' build-shared; \
12 @@ -380,7 +380,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT
13  fips/fipscanister.o:   build_fips
14  libfips$(SHLIB_EXT):           fips/fipscanister.o
15         @if [ "$(SHLIB_TARGET)" != "" ]; then \
16 -               FIPSLD_CC=$(CC); CC=fips/fipsld; export CC FIPSLD_CC; \
17 +               FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \
18                 $(MAKE) -f Makefile.shared -e $(BUILDENV) \
19                         CC=$${CC} LIBNAME=fips THIS=$@ \
20                         LIBEXTRAS=fips/fipscanister.o \
21 --- a/apps/Makefile
22 +++ b/apps/Makefile
23 @@ -153,12 +153,12 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(
24         shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
25                 shlib_target="$(SHLIB_TARGET)"; \
26         elif [ -n "$(FIPSCANLIB)" ]; then \
27 -         FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
28 +         FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
29         fi; \
30         LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
31         [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
32         $(MAKE) -f $(TOP)/Makefile.shared -e \
33 -               CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
34 +               CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
35                 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
36                 link_app.$${shlib_target}
37         -(cd ..; \