components/erlang/patches/configure.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 10 Dec 2015 12:35:02 -0800
changeset 5179 07d5ad88cb1d
parent 4164 78ce887dcfd6
permissions -rw-r--r--
22341948 check.pc includes cflags that break Studio

Adjust the set of standard locations that the erlang erts configure script
uses to try to find SSL. Without this change, we see the following error
at pkglint time:

ERROR userland.action001.3        bad RUNPATH, 'usr/lib/amd64/erlang/lib/crypto-3.5/priv/lib/crypto.so' includes '/usr/local/lib/64:/opt/local/lib/64:/usr/pkg/lib/64:/usr/local/openssl/lib/64:/usr/lib/openssl/lib/64:/usr/openssl/lib/64:/usr/local/ssl/lib/64:/usr/lib/ssl/lib/64:/usr/ssl/lib/64://lib/64:/usr/local/lib:/opt/local/lib:/usr/pkg/lib:/usr/local/openssl/lib:/usr/lib/openssl/lib:/usr/openssl/lib:/usr/local/ssl/lib:/usr/lib/ssl/lib:/usr/ssl/lib://lib'

This change will not be sent upstream.

--- otp_src_17.5/erts/configure.orig	2015-04-02 08:56:31.437691859 -0700
+++ otp_src_17.5/erts/configure	2015-04-02 08:56:55.704719035 -0700
@@ -38754,7 +38754,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.