OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Oct-2006 09:35:48
Branch: HEAD Handle: 2006101108354800
Modified files:
openpkg-src/python python.patch python.spec
Log:
move a few substs for setup.py to python.patch and add another new
hunk for fixing tkinter support
Summary:
Revision Changes Path
1.10 +83 -3 openpkg-src/python/python.patch
1.69 +1 -15 openpkg-src/python/python.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/python/python.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 python.patch
--- openpkg-src/python/python.patch 30 Mar 2006 06:39:16 -0000 1.9
+++ openpkg-src/python/python.patch 11 Oct 2006 07:35:48 -0000 1.10
@@ -1,7 +1,7 @@
Index: Include/pyport.h
---- Include/pyport.h.orig 2005-09-14 19:54:39 +0200
-+++ Include/pyport.h 2006-03-30 08:26:07 +0200
-@@ -251,8 +251,12 @@
+--- Include/pyport.h.orig 2006-06-10 14:23:46 +0200
++++ Include/pyport.h 2006-10-11 09:29:21 +0200
+@@ -370,8 +370,12 @@
* config to #define Py_HUGE_VAL to something that works on your platform.
*/
#ifndef Py_HUGE_VAL
@@ -14,3 +14,83 @@
/* Py_OVERFLOWED(X)
* Return 1 iff a libm function overflowed. Set errno to 0 before calling
+Index: configure
+--- configure.orig 2006-09-05 04:54:42 +0200
++++ configure 2006-10-11 09:29:21 +0200
+@@ -3800,11 +3800,11 @@
+ # debug builds.
+ OPT="-g -Wall $STRICT_PROTO"
+ else
+- OPT="-g -O3 -Wall $STRICT_PROTO"
++ OPT="-g -O2 -Wall $STRICT_PROTO"
+ fi
+ ;;
+ *)
+- OPT="-O3 -Wall $STRICT_PROTO"
++ OPT="-O2 -Wall $STRICT_PROTO"
+ ;;
+ esac
+ case $ac_sys_system in
+@@ -11136,7 +11136,7 @@
+ then
+ LINKFORSHARED="-Wl,--export-dynamic"
+ fi;;
+- SunOS/5*) case $CC in
++ SunOS/5*) case gcc in
+ *gcc*)
+ if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
+ then
+Index: setup.py
+--- setup.py.orig 2006-08-10 01:42:18 +0200
++++ setup.py 2006-10-11 09:30:42 +0200
+@@ -244,8 +244,8 @@
+
+ def detect_modules(self):
+ # Ensure that /usr/local is always used
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++
++
+
+ # Add paths specified in the environment variables LDFLAGS and
+ # CPPFLAGS for header and library files.
+@@ -520,7 +520,7 @@
+ depends = ['socketmodule.h']) )
+ # Detect SSL support for the socket module (via _ssl)
+ search_for_ssl_incs_in = [
+- '/usr/local/ssl/include',
++
+ '/usr/contrib/ssl/include/'
+ ]
+ ssl_incs = find_file('openssl/ssl.h', inc_dirs,
+@@ -532,7 +532,7 @@
+ if krb5_h:
+ ssl_incs += krb5_h
+ ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+- ['/usr/local/ssl/lib',
++ [
+ '/usr/contrib/ssl/lib/'
+ ] )
+
+@@ -614,11 +614,11 @@
+ # top of the normal inc_dirs.
+ db_inc_paths = [
+ '/usr/include/db4',
+- '/usr/local/include/db4',
++
+ '/opt/sfw/include/db4',
+ '/sw/include/db4',
+ '/usr/include/db3',
+- '/usr/local/include/db3',
++
+ '/opt/sfw/include/db3',
+ '/sw/include/db3',
+ ]
+@@ -1223,6 +1223,7 @@
+ dotversion = dotversion[:-1] + '.' + dotversion[-1]
+ tcl_include_sub = []
+ tk_include_sub = []
++ dotversion = ''
+ for dir in inc_dirs:
+ tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
+ tk_include_sub += [dir + os.sep + "tk" + dotversion]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/python/python.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 python.spec
--- openpkg-src/python/python.spec 19 Sep 2006 15:21:11 -0000 1.68
+++ openpkg-src/python/python.spec 11 Oct 2006 07:35:48 -0000 1.69
@@ -33,7 +33,7 @@
Group: Language
License: GPL
Version: 2.5
-Release: 20060919
+Release: 20061011
# package options
%option with_readline no
@@ -117,20 +117,6 @@
%setup -q -n Python-%{version}
%patch -p0
%{l_shtool} subst \
- -e 's;-O3;-O2;g' \
- -e 's;\(SunOS.*case \)\$CC\( in\);\1gcc\2;' \
- configure
- %{l_shtool} subst \
- -e 's;add_dir_to_list(self\.compiler\.library_dirs,
./usr/local/lib.);;' \
- -e 's;add_dir_to_list(self\.compiler\.include_dirs,
./usr/local/include.);;' \
- -e 's;./usr/local/BerkeleyDB[0-9.]*/lib.,;;g' \
- -e 's;./usr/local/BerkeleyDB[0-9.]*/include.,;;g' \
- -e 's;./usr/local/lib.,;;g' \
- -e 's;./usr/local/include/db[0-9]*.,;;g' \
- -e 's;./usr/local/ssl/lib.,;;g' \
- -e 's;./usr/local/ssl/include.,;;g' \
- setup.py
- %{l_shtool} subst \
-e 's;altinstall bininstall maninstall;altinstall maninstall;' \
-e 's;python$(VERSION);python;g' \
Makefile.pre.in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
