Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openssl/openssl-1.0.1-fips-140/patches/20-remove_rpath.patch
author Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Wed, 29 Jan 2014 11:12:07 -0800
branchs11-update
changeset 2921 8da1e7689d13
parent 363 components/openssl/openssl-0.9.8-fips-140/patches/20-remove_rpath.patch@9c0cad004039
permissions -rw-r--r--
PSARC/2013/383 OpenSSL FIPS 140-2 version update 15801760 SUNBT7181479 FIPS-capable version of OpenSSL using OpenSSL FIPS Object Module v2 18024740 problem in UTILITY/OPENSSL 17836054 EVP_DigestUpdate crashes because of a NULL pointer 17952352 FIPS OpenSSL needs same patches as non-FIPS OpenSSL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2921
8da1e7689d13 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
     1
 
--- /export/openssl/openssl-1.0.0d/Makefile.shared	Sat Aug 21 13:36:49 2010
8da1e7689d13 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
     2
 
+++ openssl-1.0.0d/Makefile.shared	Mon Feb 14 14:25:51 2011
8da1e7689d13 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
     3
 
@@ -393,7 +393,7 @@
8da1e7689d13 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
     4
 
 	@ if $(DETECT_GNU_LD); then \
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     5
 
 		$(DO_GNU_APP); \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     6
 
 	else \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     7
 
-		LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     8
 
+		LDFLAGS="$(CFLAGS)"; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     9
 
 	fi; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    10
 
 	$(LINK_APP)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    11
upstream/oracle/userland-gate