Merge branch 'dev-1.1'

[packages/openssl.git] / openssl-ldflags.patch

diff --git a/openssl-ldflags.patch b/openssl-ldflags.patch
deleted file mode 100644 (file)
index d53dd6f..0000000
--- a/openssl-ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-updated from http://bugs.gentoo.org/181438
-
-make sure we respect LDFLAGS
-
---- openssl-1.0.0/Makefile.org.orig    2010-04-10 11:21:33.852993924 +0200
-+++ openssl-1.0.0/Makefile.org 2010-04-10 11:22:52.248992248 +0200
-@@ -189,6 +189,7 @@
-               MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
-               DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'    \
-               MAKEDEPPROG='$(MAKEDEPPROG)'                    \
-+              LDFLAGS='$(LDFLAGS)'                            \
-               SHARED_LDFLAGS='$(SHARED_LDFLAGS)'              \
-               KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'   \
-               ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'     \
---- openssl-0.9.8h/Makefile.shared
-+++ openssl-0.9.8h/Makefile.shared
-@@ -153,7 +153,7 @@
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- 
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
- 
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to