diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-03 20:02:42 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-03 20:02:42 +0000 |
| commit | 9949bd00f10764c8d32e8202c538a57388abeda0 (patch) | |
| tree | 9dcbdc32297509814a9597416b6cfac9e033f001 /package/openssl/patches/180-fix_link_segfault.patch | |
| parent | 229fc9a0d02b07f4e99b122936e1a6008b27b8f5 (diff) | |
openssl: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28736 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/openssl/patches/180-fix_link_segfault.patch')
| -rw-r--r-- | package/openssl/patches/180-fix_link_segfault.patch | 8 |
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 66d37cbe8..3e36beb49 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} \ |