equal
deleted
inserted
replaced
1 --- otp_src_R12B-5/lib/erl_interface/configure.orig Wed Jan 25 05:47:46 2012 |
1 This patch makes two changes: |
2 +++ otp_src_R12B-5/lib/erl_interface/configure Wed Jan 25 05:51:11 2012 |
2 |
3 @@ -5043,16 +5043,6 @@ |
3 1) Removes references to /usr/ucb/install which no longer exists in Solaris 12. |
|
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 |
|
10 --- otp_src_R15B03/lib/erl_interface/configure.orig 2012-12-12 07:42:11.245364398 -0800 |
|
11 +++ otp_src_R15B03/lib/erl_interface/configure 2012-12-12 07:42:31.268827476 -0800 |
|
12 @@ -5212,16 +5212,6 @@ |
4 { (exit 1); exit 1; }; } |
13 { (exit 1); exit 1; }; } |
5 fi |
14 fi |
6 |
15 |
7 -case $host in |
16 -case $host in |
8 - *-*-solaris*|free_source) |
17 - *-*-solaris*|free_source) |
15 -esac |
24 -esac |
16 - |
25 - |
17 # Find a good install program. We prefer a C program (faster), |
26 # Find a good install program. We prefer a C program (faster), |
18 # so one script is as good as another. But avoid the broken or |
27 # so one script is as good as another. But avoid the broken or |
19 # incompatible versions: |
28 # incompatible versions: |
20 --- otp_src_R12B-5/erts/configure.orig Wed Jan 25 06:18:20 2012 |
29 --- otp_src_R15B03/erts/configure.orig 2012-12-12 07:41:37.651907946 -0800 |
21 +++ otp_src_R12B-5/erts/configure Wed Jan 25 06:18:34 2012 |
30 +++ otp_src_R15B03/erts/configure 2012-12-28 07:28:38.797816435 -0800 |
22 @@ -5283,15 +5283,6 @@ |
31 @@ -6223,15 +6223,6 @@ |
23 |
32 echo "$as_me: WARNING: No 'fop' command found: going to generate placeholder PDF files" >&2;} |
24 _search_path= |
33 fi |
25 |
34 |
26 -case $host in |
35 -case $host in |
27 - *-*-solaris*|free_source) |
36 - *-*-solaris*|free_source) |
28 - if test -x /usr/ucb/install; then |
37 - if test -x /usr/ucb/install; then |
29 - INSTALL="/usr/ucb/install -c" |
38 - INSTALL="/usr/ucb/install -c" |
33 - ;; |
42 - ;; |
34 -esac |
43 -esac |
35 # Find a good install program. We prefer a C program (faster), |
44 # Find a good install program. We prefer a C program (faster), |
36 # so one script is as good as another. But avoid the broken or |
45 # so one script is as good as another. But avoid the broken or |
37 # incompatible versions: |
46 # incompatible versions: |
|
47 @@ -36432,7 +36423,7 @@ |
|
48 |
|
49 |
|
50 |
|
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" |
|
52 +std_ssl_locations="/usr" |
|
53 |
|
54 |
|
55 # Check whether --with-ssl-zlib or --without-ssl-zlib was given. |