upstream/oracle/userland-gate: components/curl/patches/000-configure.patch@0a3f0d2f2c86 (annotated)

4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	1	Solaris specific changes needed for how we configure curl.
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	2
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	3	These changes need to be sent upstream, but before that can be done,
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	4	they need to be reworked. They also need to apply to configure.ac,
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	5	not configure.
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	6
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	7	--- configure.orig 2014-09-10 11:57:00.611789155 -0700
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	8	+++ configure 2014-09-10 13:24:14.999402937 -0700
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	9	@@ -2975,7 +2975,7 @@
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	10
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	11
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	12
4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	13	-ac_config_headers="$ac_config_headers lib/curl_config.h include/curl/curlbuild.h"
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	14	+ac_config_headers="$ac_config_headers lib/curl_config.h"
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	15
4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	16
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	17
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	18	@@ -3501,12 +3501,6 @@
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	19	fi
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	20
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	21
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	22	-
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	23	-
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	24	-if test -f ${srcdir}/include/curl/curlbuild.h; then
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	25	- rm -f ${srcdir}/include/curl/curlbuild.h
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	26	-fi
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	27	-
4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	28	CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "$.*$"/\1/p' ${srcdir}/include/curl/curlver.h`
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	29
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	30	xc_prog_cc_prev_IFS=$IFS
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	31	@@ -21192,7 +21186,7 @@
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	32	gss_libname="gss"
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	33	;;
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	34	*)
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	35	- gss_libname="gssapi"
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	36	+ gss_libname="gss"
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	37	;;
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	38	esac
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	39
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	40	@@ -21212,7 +21206,7 @@
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	41	LIBS="-lgss $LIBS"
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	42	;;
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	43	*)
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	44	- LIBS="-lgssapi $LIBS"
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	45	+ LIBS="-lgss $LIBS"
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	46	;;
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	47	esac
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	48	fi
4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	49	@@ -21311,7 +21305,7 @@
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	50	if test x$cross_compiling != xyes; then
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	51	PKGTEST="yes"
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	52	fi
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	53	- PREFIX_OPENSSL=/usr/local/ssl
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	54	+ PREFIX_OPENSSL="/usr"
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	55	LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	56	;;
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	57	off)
4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	58	@@ -26982,21 +26976,14 @@
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	59
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	60
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	61
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	62	-curl_preprocess_callconv="\
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	63	-/* preprocess start */
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	64	-#ifdef HAVE_WINDOWS_H
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	65	-# define FUNCALLCONV __stdcall
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	66	-#else
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	67	-# define FUNCALLCONV
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	68	-#endif
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	69	-/* preprocess end */"
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	70	+curl_preprocess_callconv=""
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	71
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	72
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	73	#
4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	74	#
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	75	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	76	$as_echo_n "checking for curl_socklen_t data type... " >&6; }
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	77	- curl_typeof_curl_socklen_t="unknown"
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	78	+ curl_typeof_curl_socklen_t="socklen_t"
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	79	for arg1 in int SOCKET; do
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	80	for arg2 in 'struct sockaddr' void; do
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	81	for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
4103 0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	82	@@ -40418,7 +40405,6 @@
0a3f0d2f2c86 20419429 Upgrade curl to version 7.40.0 Yiteng Zhang <yiteng.zhang@oracle.com> parents: 174 diff changeset	83	do
174 187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	84	case $ac_config_target in
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	85	"lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;;
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	86	- "include/curl/curlbuild.h") CONFIG_HEADERS="$CONFIG_HEADERS include/curl/curlbuild.h" ;;
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	87	"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	88	"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
187aa0541610 7031766 LCMS needs to move to Userland Stefan Teleman <stefan.teleman@oracle.com> parents: diff changeset	89	"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

author	Yiteng Zhang <yiteng.zhang@oracle.com>
	Fri, 10 Apr 2015 16:50:24 -0700
branch	s11-update
changeset 4103	0a3f0d2f2c86
parent 174	187aa0541610
permissions	-rw-r--r--