aboutsummaryrefslogtreecommitdiffstats
path: root/package/openssl/patches/180-fix_link_segfault.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-03 20:02:42 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-03 20:02:42 +0000
commiteff467b5cce10eab322763b3c58349b59c2d4755 (patch)
tree2c9614742ca127554c05986483e78c000a18d93c /package/openssl/patches/180-fix_link_segfault.patch
parentfaf5f84cbfd4ca592e88f9f07841b019f22f3196 (diff)
downloadupstream-eff467b5cce10eab322763b3c58349b59c2d4755.tar.gz
upstream-eff467b5cce10eab322763b3c58349b59c2d4755.tar.bz2
upstream-eff467b5cce10eab322763b3c58349b59c2d4755.zip
openssl: refresh patches
SVN-Revision: 28736
Diffstat (limited to 'package/openssl/patches/180-fix_link_segfault.patch')
-rw-r--r--package/openssl/patches/180-fix_link_segfault.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/openssl/patches/180-fix_link_segfault.patch b/package/openssl/patches/180-fix_link_segfault.patch
index 66d37cbe80..3e36beb49c 100644
--- a/package/openssl/patches/180-fix_link_segfault.patch
+++ b/package/openssl/patches/180-fix_link_segfault.patch
@@ -1,16 +1,16 @@
--- a/Makefile.shared
+++ b/Makefile.shared
-@@ -93,7 +93,6 @@ LINK_APP= \
+@@ -95,7 +95,6 @@ LINK_APP= \
LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
- LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+ LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
$${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
LINK_SO= \
-@@ -103,7 +102,6 @@ LINK_SO= \
+@@ -105,7 +104,6 @@ LINK_SO= \
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
- LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+ LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
$${SHAREDCMD} $${SHAREDFLAGS} \