diff -r f2901bab71e6 -r 4363008a4219 components/erlang/patches/configure.patch --- a/components/erlang/patches/configure.patch Mon Apr 07 23:00:54 2014 -0700 +++ b/components/erlang/patches/configure.patch Wed Apr 09 10:53:40 2014 -0700 @@ -1,6 +1,15 @@ ---- otp_src_R12B-5/lib/erl_interface/configure.orig Wed Jan 25 05:47:46 2012 -+++ otp_src_R12B-5/lib/erl_interface/configure Wed Jan 25 05:51:11 2012 -@@ -5043,16 +5043,6 @@ +This patch makes two changes: + +1) Removes references to /usr/ucb/install which no longer exists in Solaris 12. +2) Adjusts the set of standard locations that the erlang configure scripts + uses to try to find SSL. Without this change, we see the following errors + at pkglint time: + ERROR userland.action001.3 bad RUNPATH, 'usr/lib/amd64/erlang/lib/crypto-2.2/priv/lib/crypto.so' includes '/opt/local/lib/64:/opt/local/lib' + ERROR userland.action001.3 bad RUNPATH, 'usr/lib/erlang/lib/crypto-2.2/priv/lib/crypto.so' includes '/opt/local/lib' + +--- otp_src_R15B03/lib/erl_interface/configure.orig 2012-12-12 07:42:11.245364398 -0800 ++++ otp_src_R15B03/lib/erl_interface/configure 2012-12-12 07:42:31.268827476 -0800 +@@ -5212,16 +5212,6 @@ { (exit 1); exit 1; }; } fi @@ -17,11 +26,11 @@ # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: ---- otp_src_R12B-5/erts/configure.orig Wed Jan 25 06:18:20 2012 -+++ otp_src_R12B-5/erts/configure Wed Jan 25 06:18:34 2012 -@@ -5283,15 +5283,6 @@ - - _search_path= +--- otp_src_R15B03/erts/configure.orig 2012-12-12 07:41:37.651907946 -0800 ++++ otp_src_R15B03/erts/configure 2012-12-28 07:28:38.797816435 -0800 +@@ -6223,15 +6223,6 @@ + echo "$as_me: WARNING: No 'fop' command found: going to generate placeholder PDF files" >&2;} + fi -case $host in - *-*-solaris*|free_source) @@ -35,3 +44,12 @@ # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: +@@ -36432,7 +36423,7 @@ + + + +-std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl" ++std_ssl_locations="/usr" + + + # Check whether --with-ssl-zlib or --without-ssl-zlib was given.