| author | Shawn Walker-Salas <shawn.walker@oracle.com> |
| Wed, 30 Mar 2016 13:33:31 -0700 | |
| changeset 5682 | 94c0ca64c022 |
| parent 4164 | 78ce887dcfd6 |
| permissions | -rw-r--r-- |
|
4164
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
1 |
Adjust the set of standard locations that the erlang erts configure script |
|
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
2 |
uses to try to find SSL. Without this change, we see the following error |
|
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
3 |
at pkglint time: |
|
1119
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
4 |
|
|
4164
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
5 |
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' |
|
1119
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
6 |
|
|
4164
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
7 |
This change will not be sent upstream. |
|
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
8 |
|
|
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
9 |
--- otp_src_17.5/erts/configure.orig 2015-04-02 08:56:31.437691859 -0700 |
|
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
10 |
+++ otp_src_17.5/erts/configure 2015-04-02 08:56:55.704719035 -0700 |
|
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
11 |
@@ -38754,7 +38754,7 @@ |
|
1119
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
12 |
|
|
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
13 |
|
|
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
14 |
|
|
4164
78ce887dcfd6
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
1119
diff
changeset
|
15 |
-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 /" |
|
1119
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
16 |
+std_ssl_locations="/usr" |
|
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
17 |
|
|
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
18 |
|
|
8acf1591784d
15985584 Update erlang to version R15B03
Rich Burridge <rich.burridge@oracle.com>
parents:
667
diff
changeset
|
19 |
# Check whether --with-ssl-zlib or --without-ssl-zlib was given. |