diff options
| -rw-r--r-- | recipes/openssl/openssl-0.9.8j/oe-ldflags.patch | 21 | ||||
| -rw-r--r-- | recipes/openssl/openssl_0.9.8j.bb | 7 |
2 files changed, 26 insertions, 2 deletions
diff --git a/recipes/openssl/openssl-0.9.8j/oe-ldflags.patch b/recipes/openssl/openssl-0.9.8j/oe-ldflags.patch new file mode 100644 index 0000000000..3a2fae64d3 --- /dev/null +++ b/recipes/openssl/openssl-0.9.8j/oe-ldflags.patch @@ -0,0 +1,21 @@ +diff -urN openssl-0.9.8j.orig/Makefile.shared openssl-0.9.8j/Makefile.shared +--- openssl-0.9.8j.orig/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 ++++ openssl-0.9.8j/Makefile.shared 2009-04-02 13:44:48.000000000 +0000 +@@ -90,7 +90,7 @@ + LINK_APP= \ + ( $(SET_X); \ + LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ +- LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ ++ LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$(OE_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=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ + LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ +@@ -100,7 +100,7 @@ + ( $(SET_X); \ + LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ + SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ +- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ ++ SHAREDFLAGS="$(OE_LDFLAGS) $${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=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ + LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ diff --git a/recipes/openssl/openssl_0.9.8j.bb b/recipes/openssl/openssl_0.9.8j.bb index d40fb48bfe..21450d2a24 100644 --- a/recipes/openssl/openssl_0.9.8j.bb +++ b/recipes/openssl/openssl_0.9.8j.bb @@ -2,10 +2,13 @@ inherit pkgconfig require openssl.inc -PR = "r1" +PR = "r2" + +export OE_LDFLAGS="${LDFLAGS}" SRC_URI += "file://configure-targets.patch;patch=1 \ file://shared-libs.patch;patch=1 \ - file://debian.patch;patch=1" + file://debian.patch;patch=1 \ + file://oe-ldflags.patch;patch=1" PARALLEL_MAKE = "" |