• file
• revisions
• annotate
• diff
• comparison
• raw

python/python.patch@3429ba7ff8dc (annotated)

python/python.patch

Tue, 20 Sep 2011 15:22:39 +0200

author

Michael Schloh von Bennewitz <michael@schloh.com>

date

Tue, 20 Sep 2011 15:22:39 +0200

changeset 369

3429ba7ff8dc

child 370

6475ac4895a9

permissions

-rw-r--r--

Import package vendor original specs for necessary manipulations.

michael@369	1	Index: configure
michael@369	2	--- configure.orig 2010-11-01 02:47:19.000000000 +0100
michael@369	3	+++ configure 2010-12-05 18:07:39.000000000 +0100
michael@369	4	@@ -3904,9 +3904,9 @@
michael@369	5	CFLAGS=$ac_save_CFLAGS
michael@369	6	elif test $ac_cv_prog_cc_g = yes; then
michael@369	7	if test "$GCC" = yes; then
michael@369	8	- CFLAGS="-g -O2"
michael@369	9	+ CFLAGS="-O2"
michael@369	10	else
michael@369	11	- CFLAGS="-g"
michael@369	12	+ CFLAGS=""
michael@369	13	fi
michael@369	14	else
michael@369	15	if test "$GCC" = yes; then
michael@369	16	@@ -5352,7 +5352,7 @@
michael@369	17	# debug builds.
michael@369	18	OPT="-g -O0 -Wall $STRICT_PROTO"
michael@369	19	else
michael@369	20	- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
michael@369	21	+ OPT="$WRAP -O3 -Wall $STRICT_PROTO"
michael@369	22	fi
michael@369	23	;;
michael@369	24	*)
michael@369	25	@@ -7627,24 +7627,24 @@
michael@369	26	FreeBSD*)
michael@369	27	if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
michael@369	28	then
michael@369	29	- LDSHARED='$(CC) -shared ${LDFLAGS}'
michael@369	30	- LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
michael@369	31	+ LDSHARED="\$(CC) -shared ${LDFLAGS}"
michael@369	32	+ LDCXXSHARED="\$(CXX) -shared ${LDFLAGS}"
michael@369	33	else
michael@369	34	LDSHARED="ld -Bshareable ${LDFLAGS}"
michael@369	35	fi;;
michael@369	36	OpenBSD*)
michael@369	37	if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
michael@369	38	then
michael@369	39	- LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
michael@369	40	- LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
michael@369	41	+ LDSHARED="\$(CC) -shared \$(CCSHARED) ${LDFLAGS}"
michael@369	42	+ LDCXXSHARED="\$(CXX) -shared \$(CCSHARED) ${LDFLAGS}"
michael@369	43	else
michael@369	44	case `uname -r` in
michael@369	45	[01].* | 2.[0-7] | 2.[0-7].*)
michael@369	46	LDSHARED="ld -Bshareable ${LDFLAGS}"
michael@369	47	;;
michael@369	48	*)
michael@369	49	- LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
michael@369	50	- LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
michael@369	51	+ LDSHARED="\$(CC) -shared \$(CCSHARED) ${LDFLAGS}"
michael@369	52	+ LDCXXSHARED="\$(CXX) -shared \$(CCSHARED) ${LDFLAGS}"
michael@369	53	;;
michael@369	54	esac
michael@369	55	fi;;
michael@369	56	@@ -7751,7 +7751,7 @@
michael@369	57	then
michael@369	58	LINKFORSHARED="-Wl,--export-dynamic"
michael@369	59	fi;;
michael@369	60	- SunOS/5*) case $CC in
michael@369	61	+ SunOS/5*) case gcc in
michael@369	62	*gcc*)
michael@369	63	if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
michael@369	64	then
michael@369	65	Index: setup.py
michael@369	66	--- setup.py.orig 2010-10-31 17:40:21.000000000 +0100
michael@369	67	+++ setup.py 2010-12-05 18:05:56.000000000 +0100
michael@369	68	@@ -347,8 +347,8 @@
michael@369	69
michael@369	70	def detect_modules(self):
michael@369	71	# Ensure that /usr/local is always used
michael@369	72	- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
michael@369	73	- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
michael@369	74	+ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib')
michael@369	75	+ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include')
michael@369	76
michael@369	77	# Add paths specified in the environment variables LDFLAGS and
michael@369	78	# CPPFLAGS for header and library files.
michael@369	79	@@ -680,8 +680,6 @@
michael@369	80	depends = ['socketmodule.h']) )
michael@369	81	# Detect SSL support for the socket module (via _ssl)
michael@369	82	search_for_ssl_incs_in = [
michael@369	83	- '/usr/local/ssl/include',
michael@369	84	- '/usr/contrib/ssl/include/'
michael@369	85	]
michael@369	86	ssl_incs = find_file('openssl/ssl.h', inc_dirs,
michael@369	87	search_for_ssl_incs_in
michael@369	88	@@ -692,8 +690,7 @@
michael@369	89	if krb5_h:
michael@369	90	ssl_incs += krb5_h
michael@369	91	ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
michael@369	92	- ['/usr/local/ssl/lib',
michael@369	93	- '/usr/contrib/ssl/lib/'
michael@369	94	+ ['@l_prefix@/lib'
michael@369	95	] )
michael@369	96
michael@369	97	if (ssl_incs is not None and
michael@369	98	@@ -813,14 +810,8 @@
michael@369	99	# top of the normal inc_dirs.
michael@369	100	db_inc_paths = [
michael@369	101	'/usr/include/db4',
michael@369	102	- '/usr/local/include/db4',
michael@369	103	'/opt/sfw/include/db4',
michael@369	104	- '/usr/include/db3',
michael@369	105	- '/usr/local/include/db3',
michael@369	106	- '/opt/sfw/include/db3',
michael@369	107	- # Fink defaults (http://fink.sourceforge.net/)
michael@369	108	'/sw/include/db4',
michael@369	109	- '/sw/include/db3',
michael@369	110	]
michael@369	111	# 4.x minor number specific paths
michael@369	112	for x in gen_db_minor_ver_nums(4):
michael@369	113	@@ -1708,6 +1699,7 @@
michael@369	114	dotversion = dotversion[:-1] + '.' + dotversion[-1]
michael@369	115	tcl_include_sub = []
michael@369	116	tk_include_sub = []
michael@369	117	+ dotversion = ''
michael@369	118	for dir in inc_dirs:
michael@369	119	tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
michael@369	120	tk_include_sub += [dir + os.sep + "tk" + dotversion]