upstream/oracle/userland-gate: components/erlang/patches/configure.patch@8acf1591784d (annotated)

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

author	Rich Burridge <rich.burridge@oracle.com>
	Sun, 13 Jan 2013 13:37:52 -0800
changeset 1119	8acf1591784d
parent 667	bf7a382b5272
child 4164	78ce887dcfd6
permissions	-rw-r--r--