1 This patch makes two changes: |
1 Adjust the set of standard locations that the erlang erts configure script |
|
2 uses to try to find SSL. Without this change, we see the following error |
|
3 at pkglint time: |
2 |
4 |
3 1) Removes references to /usr/ucb/install which no longer exists in Solaris 12. |
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' |
4 2) Adjusts the set of standard locations that the erlang configure scripts |
|
5 uses to try to find SSL. Without this change, we see the following errors |
|
6 at pkglint time: |
|
7 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' |
|
8 ERROR userland.action001.3 bad RUNPATH, 'usr/lib/erlang/lib/crypto-2.2/priv/lib/crypto.so' includes '/opt/local/lib' |
|
9 |
6 |
10 --- otp_src_R15B03/lib/erl_interface/configure.orig 2012-12-12 07:42:11.245364398 -0800 |
7 This change will not be sent upstream. |
11 +++ otp_src_R15B03/lib/erl_interface/configure 2012-12-12 07:42:31.268827476 -0800 |
8 |
12 @@ -5212,16 +5212,6 @@ |
9 --- otp_src_17.5/erts/configure.orig 2015-04-02 08:56:31.437691859 -0700 |
13 { (exit 1); exit 1; }; } |
10 +++ otp_src_17.5/erts/configure 2015-04-02 08:56:55.704719035 -0700 |
14 fi |
11 @@ -38754,7 +38754,7 @@ |
15 |
|
16 -case $host in |
|
17 - *-*-solaris*|free_source) |
|
18 - if test -x /usr/ucb/install; then |
|
19 - INSTALL="/usr/ucb/install -c" |
|
20 - fi |
|
21 - ;; |
|
22 - *) |
|
23 - ;; |
|
24 -esac |
|
25 - |
|
26 # Find a good install program. We prefer a C program (faster), |
|
27 # so one script is as good as another. But avoid the broken or |
|
28 # incompatible versions: |
|
29 --- otp_src_R15B03/erts/configure.orig 2012-12-12 07:41:37.651907946 -0800 |
|
30 +++ otp_src_R15B03/erts/configure 2012-12-28 07:28:38.797816435 -0800 |
|
31 @@ -6223,15 +6223,6 @@ |
|
32 echo "$as_me: WARNING: No 'fop' command found: going to generate placeholder PDF files" >&2;} |
|
33 fi |
|
34 |
|
35 -case $host in |
|
36 - *-*-solaris*|free_source) |
|
37 - if test -x /usr/ucb/install; then |
|
38 - INSTALL="/usr/ucb/install -c" |
|
39 - fi |
|
40 - ;; |
|
41 - *) |
|
42 - ;; |
|
43 -esac |
|
44 # Find a good install program. We prefer a C program (faster), |
|
45 # so one script is as good as another. But avoid the broken or |
|
46 # incompatible versions: |
|
47 @@ -36432,7 +36423,7 @@ |
|
48 |
12 |
49 |
13 |
50 |
14 |
51 -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" |
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 /" |
52 +std_ssl_locations="/usr" |
16 +std_ssl_locations="/usr" |
53 |
17 |
54 |
18 |
55 # Check whether --with-ssl-zlib or --without-ssl-zlib was given. |
19 # Check whether --with-ssl-zlib or --without-ssl-zlib was given. |