d71b9a7269
2.4.4 => 2.4.8 2.5.2 => 2.5.4 2.6 => 2.6.1 Python 2.4 and 2.5 lose their build knobs to match 2.6. Removes no longer needed Python 2.5 security patches backported from the release25-maint SVN branch. Remove the -bz2 subpackage from all three versions. It is silly to make a subpackage to avoid depending on something tiny and compatibly licensed. Python 2.4 and 2.5 lose their -expat subpackages; expat has been in base for some time. Python 2.5 loses its sqlite subpackge. Again, sqlite is tiny, compatibly licensed and is depended upon by more and more applications. This brings it into line with the 2.6 version. Rework all three version's handling of setup.py. Rather than regex replacing LOCALBASE and X11BASE into setup.py post-configure, these are passed in though environment variables. Will save hours of frustrated cursing familiar to anyone who has accidently used the update-patches target after configure and had to go back and redo all the substitutions. Rework the patching of setup.py for 2.4 and 2.5 to be more like what we do for 2.6. I.e. keep the diff minimal and avoid deleting huge blocks of code, so the diff has a chance of applying without massive hand-editing each patch release. Fix .py paths in installed .pyc files (patch from eric@) feedback from several, particularly eric@, ajacoutot@ and Ingo Schwarze; "get it in" ajacoutot@
25 lines
1.1 KiB
Plaintext
25 lines
1.1 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.8 2009/01/01 21:03:27 djm Exp $
|
|
--- configure.in.orig Wed Oct 18 02:03:36 2006
|
|
+++ configure.in Fri Dec 26 12:27:20 2008
|
|
@@ -197,7 +197,7 @@ case $ac_sys_system/$ac_sys_release in
|
|
# On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
|
|
# even though select is a POSIX function. Reported by J. Ribbens.
|
|
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
|
|
- OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0@:>@)
|
|
+ OpenBSD*)
|
|
define_xopen_source=no;;
|
|
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
|
|
# of union __?sigval. Reported by Stuart Bishop.
|
|
@@ -1616,9 +1616,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-U
|
|
|
|
# only check for sem_ini if thread support is requested
|
|
if test "$with_threads" = "yes" -o -z "$with_threads"; then
|
|
- AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
|
|
+# AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
|
|
# posix4 on Solaris 2.6
|
|
# pthread (first!) on Linux
|
|
+ LIBS="-pthread $(LIBS)"
|
|
fi
|
|
|
|
# check if we need libintl for locale functions
|