python: update to 2.5
This commit is contained in:
parent
c50fa4f7a2
commit
899215f266
5730
python/.footprint
5730
python/.footprint
File diff suppressed because it is too large
Load Diff
@ -1,2 +1,2 @@
|
||||
0ba90c79175c017101100ebf5978e906 Python-2.4.4.tar.bz2
|
||||
8106a7ca44a265743c66c83b7ad477fe python-2.4.4.patch
|
||||
ddb7401e711354ca83b7842b733825a3 Python-2.5.tar.bz2
|
||||
cc6b0643c9397f953f6811a9b9311890 python-2.5.patch
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Description: Python interpreter
|
||||
# Description: Python interpreter, version 2.5
|
||||
# URL: http://www.python.org
|
||||
# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
|
||||
# Depends on: db, gdbm, ncurses, openssl, readline, zlib
|
||||
|
||||
name=python
|
||||
version=2.4.4
|
||||
version=2.5
|
||||
release=1
|
||||
source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.bz2 \
|
||||
$name-$version.patch)
|
||||
@ -13,7 +13,6 @@ build () {
|
||||
cd Python-$version
|
||||
|
||||
patch -p1 < $SRC/$name-$version.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--enable-shared \
|
||||
--with-threads \
|
||||
@ -21,12 +20,13 @@ build () {
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
ln -sf python2.4 $PKG/usr/bin/python
|
||||
ln -sf python2.4 $PKG/usr/lib/python
|
||||
ln -sf python2.4 $PKG/usr/include/python
|
||||
ln -sf python2.5 $PKG/usr/bin/python
|
||||
ln -sf python2.5 $PKG/usr/lib/python
|
||||
ln -sf python2.5 $PKG/usr/include/python
|
||||
|
||||
rm -r $PKG/usr/lib/python/{email,bsddb}/test
|
||||
rm -r $PKG/usr/lib/python/{bsddb,ctypes,email,sqlite3}/test
|
||||
rm -r $PKG/usr/lib/python/distutils/tests
|
||||
rm $PKG/usr/lib/python/{distutils,site-packages,test}/README
|
||||
rm $PKG/usr/lib/python/idlelib/{ChangeLog,{NEWS,README,TODO}.txt}
|
||||
rm $PKG/usr/lib/python/ctypes/macholib/README.ctypes
|
||||
}
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
diff -Nru Python-2.4.4.orig/Lib/cgi.py Python-2.4.4/Lib/cgi.py
|
||||
--- Python-2.4.4.orig/Lib/cgi.py 2006-10-19 19:31:02.000000000 +0200
|
||||
+++ Python-2.4.4/Lib/cgi.py 2006-10-19 19:31:15.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/local/bin/python
|
||||
+#! /usr/bin/python
|
||||
|
||||
# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
|
||||
# intentionally NOT "/usr/bin/env python". On many systems
|
||||
diff -Nru Python-2.4.4.orig/Modules/Setup.dist Python-2.4.4/Modules/Setup.dist
|
||||
--- Python-2.4.4.orig/Modules/Setup.dist 2006-10-19 19:31:02.000000000 +0200
|
||||
+++ Python-2.4.4/Modules/Setup.dist 2006-10-19 19:31:15.000000000 +0200
|
||||
@@ -149,7 +149,7 @@
|
||||
# modules are to be built as shared libraries (see above for more
|
||||
# detail; also note that *static* reverses this effect):
|
||||
|
||||
-#*shared*
|
||||
+*shared*
|
||||
|
||||
# GNU readline. Unlike previous Python incarnations, GNU readline is
|
||||
# now incorporated in an optional module, configured in the Setup file
|
||||
@@ -159,7 +159,7 @@
|
||||
# it, depending on your system -- see the GNU readline instructions.
|
||||
# It's okay for this to be a shared library, too.
|
||||
|
||||
-#readline readline.c -lreadline -ltermcap
|
||||
+readline readline.c -lreadline -lncurses
|
||||
|
||||
|
||||
# Modules that should always be present (non UNIX dependent):
|
||||
@@ -350,9 +350,9 @@
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
-#_curses _cursesmodule.c -lcurses -ltermcap
|
||||
+_curses _cursesmodule.c -lncurses
|
||||
# Wrapper for the panel library that's part of ncurses and SYSV curses.
|
||||
-#_curses_panel _curses_panel.c -lpanel -lncurses
|
||||
+_curses_panel _curses_panel.c -lpanel -lncurses
|
||||
|
||||
|
||||
# Generic (SunOS / SVR4) dynamic loading module.
|
||||
@@ -377,13 +377,13 @@
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
-#dbm dbmmodule.c # dbm(3) may require -lndbm or similar
|
||||
+dbm dbmmodule.c -DHAVE_NDBM_H -lgdbm_compat -lgdbm # dbm(3) may require -lndbm or similar
|
||||
|
||||
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
-#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
|
||||
+gdbm gdbmmodule.c -lgdbm
|
||||
|
||||
|
||||
# Sleepycat Berkeley DB interface.
|
||||
@@ -398,11 +398,11 @@
|
||||
#
|
||||
# Edit the variables DB and DBLIBVERto point to the db top directory
|
||||
# and the subdirectory of PORT where you built it.
|
||||
-#DB=/usr/local/BerkeleyDB.4.0
|
||||
-#DBLIBVER=4.0
|
||||
-#DBINC=$(DB)/include
|
||||
-#DBLIB=$(DB)/lib
|
||||
-#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
|
||||
+DB=/usr
|
||||
+DBLIBVER=4.4
|
||||
+DBINC=$(DB)/include
|
||||
+DBLIB=$(DB)/lib
|
||||
+_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
|
||||
|
||||
# Historical Berkeley DB 1.85
|
||||
#
|
||||
diff -Nru Python-2.4.4.orig/configure Python-2.4.4/configure
|
||||
--- Python-2.4.4.orig/configure 2006-10-19 19:31:02.000000000 +0200
|
||||
+++ Python-2.4.4/configure 2006-10-19 19:31:15.000000000 +0200
|
||||
@@ -3822,7 +3822,7 @@
|
||||
# debug builds.
|
||||
OPT="-g -Wall -Wstrict-prototypes"
|
||||
else
|
||||
- OPT="-g -O3 -Wall -Wstrict-prototypes"
|
||||
+ OPT="$CFLAGS -Wall -Wstrict-prototypes"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
42
python/python-2.5.patch
Normal file
42
python/python-2.5.patch
Normal file
@ -0,0 +1,42 @@
|
||||
diff -Nru Python-2.5.orig/Lib/cgi.py Python-2.5/Lib/cgi.py
|
||||
--- Python-2.5.orig/Lib/cgi.py 2006-10-05 22:07:10.000000000 +0200
|
||||
+++ Python-2.5/Lib/cgi.py 2006-10-05 22:08:34.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/local/bin/python
|
||||
+#! /usr/bin/python
|
||||
|
||||
# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
|
||||
# intentionally NOT "/usr/bin/env python". On many systems
|
||||
diff -Nru Python-2.5.orig/Modules/Setup.dist Python-2.5/Modules/Setup.dist
|
||||
--- Python-2.5.orig/Modules/Setup.dist 2006-10-05 22:07:10.000000000 +0200
|
||||
+++ Python-2.5/Modules/Setup.dist 2006-10-05 22:08:59.000000000 +0200
|
||||
@@ -149,7 +149,7 @@
|
||||
# modules are to be built as shared libraries (see above for more
|
||||
# detail; also note that *static* reverses this effect):
|
||||
|
||||
-#*shared*
|
||||
+*shared*
|
||||
|
||||
# GNU readline. Unlike previous Python incarnations, GNU readline is
|
||||
# now incorporated in an optional module, configured in the Setup file
|
||||
@@ -381,7 +381,7 @@
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
-#dbm dbmmodule.c # dbm(3) may require -lndbm or similar
|
||||
+dbm dbmmodule.c -DHAVE_NDBM_H -lgdbm_compat -lgdbm # dbm(3) may require -lndbm or similar
|
||||
|
||||
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
|
||||
#
|
||||
diff -Nru Python-2.5.orig/configure Python-2.5/configure
|
||||
--- Python-2.5.orig/configure 2006-10-05 22:07:10.000000000 +0200
|
||||
+++ Python-2.5/configure 2006-10-05 22:10:15.000000000 +0200
|
||||
@@ -3800,7 +3800,7 @@
|
||||
# debug builds.
|
||||
OPT="-g -Wall $STRICT_PROTO"
|
||||
else
|
||||
- OPT="-g -O3 -Wall $STRICT_PROTO"
|
||||
+ OPT="$CFLAGS -Wall $STRICT_PROTO"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
Loading…
Reference in New Issue
Block a user