Hello community,
here is the log from the commit of package python for openSUSE:Factory
checked in at Fri Sep 3 17:55:47 CEST 2010.
--------
--- python/python-base.changes 2010-07-02 15:58:42.000000000 +0200
+++ python/python-base.changes 2010-08-26 17:20:28.000000000 +0200
@@ -1,0 +2,26 @@
+Thu Aug 26 15:13:49 UTC 2010 - suse-tux@gmx.de
+
+- fix for urllib2 (http://bugs.python.org/issue9639)
+
+-------------------------------------------------------------------
+Thu Aug 26 13:45:19 UTC 2010 - jmatejek@novell.com
+
+- fixed distutils test
+- dropped autoconf version requirement (it builds just fine with other versions)
+
+-------------------------------------------------------------------
+Thu Aug 26 11:37:28 UTC 2010 - jmatejek@novell.com
+
+- update to version 2.7
+ * improved handling of numeric types
+ * deprecation warnings are now silent by default
+ * new argparse module for command line arguments
+ * many new features, see http://docs.python.org/dev/whatsnew/2.7.html
+ for complete list
+*** 2.7 is supposed to be the last version from the 2.x series,
+so its (upstream) maintenance period will probably be longer than usual.
+However, upstream development now focuses on 3.x series.
+
+- cleaned up spec and patches
+
+-------------------------------------------------------------------
--- python/python-doc.changes 2010-03-11 19:19:23.000000000 +0100
+++ python/python-doc.changes 2010-08-26 13:45:26.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 26 11:43:28 UTC 2010 - jmatejek@novell.com
+
+- updated to 2.7
+
+-------------------------------------------------------------------
--- python/python.changes 2010-07-02 15:57:25.000000000 +0200
+++ python/python.changes 2010-08-26 13:45:27.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 26 11:42:44 UTC 2010 - jmatejek@novell.com
+
+- update to 2.7
+ * see changes in python-base.changes
+- cleaned up the spec and patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
Python-2.3.3-dirs.patch
Python-2.6.2-multilib.patch
Python-2.6.5.tar.bz2
python-2.5.2-configure.patch
python-2.6.2-ssl_handshake_timeout.patch
python-2.6b1-canonicalize2.patch
python-2.6b3-ssl-compat.patch
python-docs-html-2.6.tar.bz2
python-docs-pdf-a4-2.6.tar.bz2
python-docs-pdf-letter-2.6.tar.bz2
New:
----
Python-2.7.tar.bz2
Python-2.7rc2-multilib.patch
python-2.7-acrequire.patch
python-2.7-dirs.patch
python-2.7-docs-html.tar.bz2
python-2.7-docs-pdf-a4.tar.bz2
python-2.7-docs-pdf-letter.tar.bz2
python-2.7rc2-canonicalize2.patch
python-2.7rc2-configure.patch
urllib2-AbstractBasicAuthHandler_reset_attr.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-base.spec ++++++
--- /var/tmp/diff_new_pack.oRP13A/_old 2010-09-03 17:53:15.000000000 +0200
+++ /var/tmp/diff_new_pack.oRP13A/_new 2010-09-03 17:53:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-base (Version 2.6.5)
+# spec file for package python-base (Version 2.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,10 +18,7 @@
Name: python-base
-BuildRequires: zlib-devel
-%if %suse_version >= 1030
-BuildRequires: fdupes
-%endif
+BuildRequires: fdupes pkg-config zlib-devel
Url: http://www.python.org/
License: MIT License (or similar)
Group: Development/Languages/Python
@@ -32,24 +29,28 @@
%endif
#
Summary: Python Interpreter base package
-Version: 2.6.5
-Release: 3
+Version: 2.7
+Release: 1
%define tarversion %{version}
%define tarname Python-%{tarversion}
Source0: %{tarname}.tar.bz2
Source1: macros.python
Source2: baselibs.conf
-Source6: README.SUSE
-Source13: distutils.cfg
-Source14: _local.pth
-Patch01: Python-2.3.3-dirs.patch
-Patch10: python-distutils-rpm-8.patch
-Patch21: Python-2.6.2-multilib.patch
-Patch25: python-2.6b1-canonicalize2.patch
-Patch35: python-2.5.2-configure.patch
-Patch38: python-2.6-gettext-plurals.patch
-Patch39: python-2.6.5-distutils_test_path.patch
-Patch40: sparc_longdouble.patch
+Source3: README.SUSE
+Source4: distutils.cfg
+Source5: _local.pth
+
+Patch1: python-2.7-dirs.patch
+Patch2: python-distutils-rpm-8.patch
+Patch3: Python-2.7rc2-multilib.patch
+Patch4: python-2.7rc2-canonicalize2.patch
+Patch5: python-2.7rc2-configure.patch
+Patch6: python-2.6-gettext-plurals.patch
+Patch7: python-2.6.5-distutils_test_path.patch
+Patch8: sparc_longdouble.patch
+Patch9: python-2.7-acrequire.patch
+Patch10: urllib2-AbstractBasicAuthHandler_reset_attr.diff
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define python_version %(echo %{version} | head -c 3)
Provides: %{name} = %{python_version}
@@ -103,14 +104,14 @@
-%package -n libpython2_6-1_0
+%package -n libpython2_7-1_0
License: MIT License (or similar)
Summary: Python Interpreter shared library
Group: Development/Languages/Python
AutoReqProv: on
#%description -n libpython%{lib_version}
-%description -n libpython2_6-1_0
+%description -n libpython2_7-1_0
Python is an interpreted, object-oriented programming language, and is
often compared to Tcl, Perl, Scheme, or Java. You can find an overview
of Python in the documentation and tutorials included in the python-doc
@@ -128,14 +129,16 @@
%prep
%setup -q -n %{tarname}
# patching
-%patch01
-%patch10 -p1
-%patch21 -p1
-%patch25
-%patch35
-%patch38
-%patch39 -p1
-%patch40 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4
+%patch5
+%patch6
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10
# some cleanup
find . -name .cvsignore -type f -print0 | xargs -0 rm -f
@@ -182,9 +185,9 @@
# at some point, and the machine does not build anything more until a
# timeout several hours later.
%ifnarch hppa %arm
-# test_file fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin
+# test_file(2k) fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin
# test_urllib2 relies on being able to resolve local address, which is notoriously impossible in autobuild
-EXCLUDE="-x test_urllib2 -x test_file"
+EXCLUDE="-x test_urllib2 -x test_file -x test_file2k"
# test_nis and test_threading are AWFULLY slow.
EXCLUDE="$EXCLUDE -x test_nis -x test_threading"
%ifarch ia64
@@ -213,8 +216,8 @@
install
# install site-specific tweaks
ln -s python%{python_version} ${RPM_BUILD_ROOT}%{_bindir}/python2
-install -m 644 %{S:13} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/distutils
-install -m 644 %{S:14} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/site-packages
+install -m 644 %{S:4} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/distutils
+install -m 644 %{S:5} ${RPM_BUILD_ROOT}%{_libdir}/python%{python_version}/site-packages
install -d -m 755 ${RPM_BUILD_ROOT}/etc/rpm
install -m 644 %{S:1} ${RPM_BUILD_ROOT}/etc/rpm
# make sure /usr/lib/python/site-packages exists even on lib64 machines
@@ -238,18 +241,17 @@
rm -r $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3}
rm $CLEANUP_DIR/ssl.py*
# does not work without _ssl.so anyway
-%if %suse_version >= 1030
# replace duplicate .pyo/.pyc with hardlinks
%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}
-%endif
########################################
# documentation
########################################
export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{name}
install -d -m 755 $PDOCS
-install -c -m 644 %{SOURCE6} $PDOCS/
+install -c -m 644 %{S:3} $PDOCS/
install -c -m 644 LICENSE $PDOCS/
install -c -m 644 README $PDOCS/
+ln -s python%{python_version}.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/python.1.gz
########################################
# devel
########################################
@@ -260,11 +262,11 @@
rm -rf $RPM_BUILD_ROOT
#%post -n libpython%{lib_version}
-%post -n libpython2_6-1_0
+%post -n libpython2_7-1_0
%{run_ldconfig}
#%postun -n libpython%{lib_version}
-%postun -n libpython2_6-1_0
+%postun -n libpython2_7-1_0
%{run_ldconfig}
%files -n python-devel
@@ -274,9 +276,12 @@
%exclude %{_libdir}/python%{python_version}/config/Makefile
%defattr(644, root, root, 755)
%{_libdir}/libpython*.so
+%{_libdir}/pkgconfig/python-%{python_version}.pc
+%{_libdir}/pkgconfig/python.pc
%{_includedir}/python*
%exclude %{_includedir}/python%{python_version}/pyconfig.h
%{_libdir}/python%{python_version}/test
+%{_libdir}/python%{python_version}/unittest
%defattr(755, root, root)
%{_bindir}/python-config
%{_bindir}/python%{python_version}-config
@@ -287,7 +292,7 @@
%{_libdir}/python%{python_version}/lib-dynload/pyexpat.so
#%files -n libpython%{lib_version}
-%files -n libpython2_6-1_0
+%files -n libpython2_7-1_0
%defattr(644, root, root)
%{_libdir}/libpython*.so.*
@@ -299,6 +304,7 @@
%doc %{_docdir}/%{name}/LICENSE
%doc %{_docdir}/%{name}/README.SUSE
%doc %{_mandir}/man1/python.1*
+%doc %{_mandir}/man1/python%{python_version}.1*
%dir %{_includedir}/python%{python_version}
%{_includedir}/python%{python_version}/pyconfig.h
%{_libdir}/python
@@ -315,27 +321,30 @@
%{_libdir}/python%{python_version}/email
%{_libdir}/python%{python_version}/encodings
%{_libdir}/python%{python_version}/hotshot
+%{_libdir}/python%{python_version}/importlib
%{_libdir}/python%{python_version}/json
%{_libdir}/python%{python_version}/lib2to3
%{_libdir}/python%{python_version}/logging
%{_libdir}/python%{python_version}/multiprocessing
%{_libdir}/python%{python_version}/plat-*
+%{_libdir}/python%{python_version}/pydoc_data
%{_libdir}/python%{python_version}/wsgiref
%dir %{_libdir}/python%{python_version}/site-packages
%{_libdir}/python%{python_version}/site-packages/README
%{_libdir}/python%{python_version}/site-packages/_local.pth
%dir %{_libdir}/python%{python_version}/lib-dynload
%{_libdir}/python%{python_version}/lib-dynload/_bisect.so
-%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so
+#%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so
%{_libdir}/python%{python_version}/lib-dynload/_csv.so
%{_libdir}/python%{python_version}/lib-dynload/_collections.so
%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so
%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so
%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so
-%{_libdir}/python%{python_version}/lib-dynload/_fileio.so
+#%{_libdir}/python%{python_version}/lib-dynload/_fileio.so
%{_libdir}/python%{python_version}/lib-dynload/_functools.so
%{_libdir}/python%{python_version}/lib-dynload/_heapq.so
%{_libdir}/python%{python_version}/lib-dynload/_hotshot.so
+%{_libdir}/python%{python_version}/lib-dynload/_io.so
%{_libdir}/python%{python_version}/lib-dynload/_json.so
%{_libdir}/python%{python_version}/lib-dynload/_locale.so
%{_libdir}/python%{python_version}/lib-dynload/_lsprof.so
++++++ python-doc.spec ++++++
--- /var/tmp/diff_new_pack.oRP13A/_old 2010-09-03 17:53:15.000000000 +0200
+++ /var/tmp/diff_new_pack.oRP13A/_new 2010-09-03 17:53:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python-doc (Version 2.6)
+# spec file for package python-doc (Version 2.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,17 +23,17 @@
Group: Development/Languages/Python
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation for Python.
-Version: 2.6
-Release: 24
-%define pyver 2.6.5
+Version: 2.7
+Release: 1
+%define pyver 2.7
BuildArch: noarch
%define tarname Python-%{pyver}
%define pyname python
Enhances: %{pyname}=%{pyver}
Source0: %{tarname}.tar.bz2
-Source1: python-docs-html-%{version}.tar.bz2
-Source2: python-docs-pdf-a4-%{version}.tar.bz2
-Source3: python-docs-pdf-letter-%{version}.tar.bz2
+Source1: python-%{version}-docs-html.tar.bz2
+Source2: python-%{version}-docs-pdf-a4.tar.bz2
+Source3: python-%{version}-docs-pdf-letter.tar.bz2
Provides: pyth_doc pyth_ps
Obsoletes: pyth_doc pyth_ps
@@ -74,7 +74,7 @@
install -d -m 755 $PDOCS/Misc
install -d -m 755 $PDOCS/paper-a4 $PDOCS/paper-letter $PDOCS/html
tar xfj %{S:1} -C $PDOCS/
-mv $PDOCS/python-docs-html $PDOCS/html
+mv $PDOCS/python-%{version}-docs-html $PDOCS/html
tar xfj %{S:2} -C $PDOCS
mv $PDOCS/docs-pdf $PDOCS/paper-a4
tar xfj %{S:3} -C $PDOCS
++++++ python.spec ++++++
--- /var/tmp/diff_new_pack.oRP13A/_old 2010-09-03 17:53:15.000000000 +0200
+++ /var/tmp/diff_new_pack.oRP13A/_new 2010-09-03 17:53:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package python (Version 2.6.5)
+# spec file for package python (Version 2.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,10 +18,7 @@
Name: python
-BuildRequires: db-devel gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel
-%if %suse_version >= 1030
-BuildRequires: fdupes
-%endif
+BuildRequires: db-devel fdupes gdbm-devel gmp-devel libbz2-devel libopenssl-devel ncurses-devel readline-devel sqlite-devel tk-devel xorg-x11-devel
#Requires: openssl >= 0.9.8e
Url: http://www.python.org/
License: MIT License (or similar)
@@ -34,28 +31,28 @@
#
Obsoletes: python-nothreads python21 python-elementtree python-sqlite
Summary: Python Interpreter
-Version: 2.6.5
-Release: 3
+Version: 2.7
+Release: 1
Requires: python-base = %{version}
%define tarversion %{version}
%define tarname Python-%{tarversion}
Source0: %{tarname}.tar.bz2
-Source6: README.SUSE
-Source8: pythonstart
-Source9: python.sh
-Source10: python.csh
+Source1: README.SUSE
+Source2: pythonstart
+Source3: python.sh
+Source4: python.csh
#Source11: testfiles.tar.bz2
# issues with copyrighted Unicode testing files
-Patch01: Python-2.3.3-dirs.patch
-Patch21: Python-2.6.2-multilib.patch
-Patch23: python-2.6b3-ssl-compat.patch
-Patch25: python-2.6b1-canonicalize2.patch
-Patch30: python-2.5.1-sqlite.patch
-Patch35: python-2.5.2-configure.patch
-Patch38: python-2.6b3-curses-panel.patch
-Patch39: python-2.6.2-ssl_handshake_timeout.patch
-Patch40: sparc_longdouble.patch
+Patch1: python-2.7-dirs.patch
+Patch2: Python-2.7rc2-multilib.patch
+Patch3: python-2.7rc2-canonicalize2.patch
+Patch4: python-2.5.1-sqlite.patch
+Patch5: python-2.7rc2-configure.patch
+Patch6: python-2.6b3-curses-panel.patch
+Patch7: sparc_longdouble.patch
+Patch8: python-2.7-acrequire.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
%define python_version %(echo %{version} | head -c 3)
%define idle_name idle
Provides: %{name} = %{python_version}
@@ -177,19 +174,14 @@
#%%setup -q -n %{tarname} -a11
%setup -q -n %{tarname}
# patching
-%patch01
-%patch21 -p1
-%patch23
-%patch25
-%patch30
-#%if 0%{?suse_version}
-#%endif
-%patch35
-%if %suse_version > 1100
-%patch38
-%endif
-%patch39
-%patch40 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3
+%patch4
+%patch5
+%patch6
+%patch7 -p1
+%patch8 -p1
# some cleanup
find . -name .cvsignore -type f -print0 | xargs -0 rm -f
find . -name CVS -type d -print0 | xargs -0 rm -rf
@@ -236,7 +228,7 @@
if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then
ulimit -v 10000000 || :
fi
-LIST="test_urllib test_ssl test_hashlib test_hmac test_urllib2_localnet test_unicodedata test_tarfile test_sqlite test_tcl test_anydbm test_dumbdbm test_gdbm test_whichdb"
+LIST="test_urllib test_ssl test_hashlib test_hmac test_urllib2_localnet test_unicodedata test_tarfile test_sqlite test_tcl test_anydbm test_dumbdbm test_gdbm test_whichdb test_tk test_ttk_textonly test_bsddb test_readline "
make test TESTOPTS="$LIST"
%endif
@@ -266,12 +258,13 @@
rm $RPM_BUILD_ROOT%{_bindir}/smtpd.py
rm $RPM_BUILD_ROOT%{_bindir}/pydoc
rm $RPM_BUILD_ROOT%{_bindir}/2to3
-rm $RPM_BUILD_ROOT%{_mandir}/man1/python.1*
+rm $RPM_BUILD_ROOT%{_mandir}/man1/python*
rm $RPM_BUILD_ROOT%{_libdir}/libpython*.so.*
rm $RPM_BUILD_ROOT%{_libdir}/python
find $RPM_BUILD_ROOT%{_libdir}/python%{python_version} -maxdepth 1 ! \( -name "ssl.py" \) -exec rm {} ";"
rm $RPM_BUILD_ROOT%{_bindir}/python%{python_version}-config
rm $RPM_BUILD_ROOT%{_bindir}/python-config
+rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*
rm -r $RPM_BUILD_ROOT%{_includedir}/python
rm -r $RPM_BUILD_ROOT%{_includedir}/python%{python_version}
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/compiler
@@ -281,27 +274,29 @@
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/email
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/encodings
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/hotshot
+rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/importlib
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/json
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib2to3
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/logging
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/multiprocessing
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/plat-*
+rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/pydoc_data
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/test
+rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/unittest
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/wsgiref
rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/xml
rm $RPM_BUILD_ROOT%{_libdir}/libpython%{python_version}.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/README
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bisect.so
-rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_csv.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_collections.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_ctypes_test.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_elementtree.so
-rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_fileio.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_functools.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_heapq.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_hotshot.so
+rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_io.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_json.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_locale.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_lsprof.so
@@ -345,16 +340,14 @@
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/audioop.so
rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/dl.so
rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info
-%if %suse_version >= 1030
# replace duplicate .pyo/.pyc with hardlinks
%fdupes $RPM_BUILD_ROOT/%{_libdir}/python%{python_version}
-%endif
########################################
# documentation
########################################
export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/%{name}
install -d -m 755 $PDOCS
-install -c -m 644 %{SOURCE6} $PDOCS/
+install -c -m 644 %{S:1} $PDOCS/
install -c -m 644 LICENSE $PDOCS/
install -c -m 644 README $PDOCS/
########################################
@@ -380,9 +373,9 @@
########################################
# startup script
########################################
-install -m 644 %{S:8} $RPM_BUILD_ROOT/etc
+install -m 644 %{S:2} $RPM_BUILD_ROOT/etc
install -d -m 755 $RPM_BUILD_ROOT/etc/profile.d
-install -m 644 %{S:9} %{S:10} $RPM_BUILD_ROOT/etc/profile.d
+install -m 644 %{S:3} %{S:4} $RPM_BUILD_ROOT/etc/profile.d
%clean
rm -rf $RPM_BUILD_ROOT
++++++ Python-2.6.5.tar.bz2 -> Python-2.7.tar.bz2 ++++++
python/Python-2.6.5.tar.bz2 python/Python-2.7.tar.bz2 differ: char 11, line 1
++++++ Python-2.7rc2-multilib.patch ++++++
Index: Python-2.7/Include/pythonrun.h
===================================================================
--- Python-2.7.orig/Include/pythonrun.h
+++ Python-2.7/Include/pythonrun.h
@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void);
/* In their own files */
PyAPI_FUNC(const char *) Py_GetVersion(void);
PyAPI_FUNC(const char *) Py_GetPlatform(void);
+PyAPI_FUNC(const char *) Py_GetArch(void);
+PyAPI_FUNC(const char *) Py_GetLib(void);
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
Index: Python-2.7/Lib/distutils/command/install.py
===================================================================
--- Python-2.7.orig/Lib/distutils/command/install.py
+++ Python-2.7/Lib/distutils/command/install.py
@@ -22,6 +22,8 @@ from site import USER_BASE
from site import USER_SITE
+libname = sys.lib
+
if sys.version < "2.2":
WINDOWS_SCHEME = {
'purelib': '$base',
@@ -42,7 +44,7 @@ else:
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
Index: Python-2.7/Lib/distutils/sysconfig.py
===================================================================
--- Python-2.7.orig/Lib/distutils/sysconfig.py
+++ Python-2.7/Lib/distutils/sysconfig.py
@@ -114,8 +114,11 @@ def get_python_lib(plat_specific=0, stan
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
- libpython = os.path.join(prefix,
- "lib", "python" + get_python_version())
+ if plat_specific or standard_lib:
+ lib = sys.lib
+ else:
+ lib = "lib"
+ libpython = os.path.join(prefix, lib, "python" + get_python_version())
if standard_lib:
return libpython
else:
Index: Python-2.7/Lib/pydoc.py
===================================================================
--- Python-2.7.orig/Lib/pydoc.py
+++ Python-2.7/Lib/pydoc.py
@@ -349,7 +349,7 @@ class Doc:
docloc = os.environ.get("PYTHONDOCS",
"http://docs.python.org/library")
- basedir = os.path.join(sys.exec_prefix, "lib",
+ basedir = os.path.join(sys.exec_prefix, sys.lib,
"python"+sys.version[0:3])
if (isinstance(object, type(os)) and
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
Index: Python-2.7/Lib/site.py
===================================================================
--- Python-2.7.orig/Lib/site.py
+++ Python-2.7/Lib/site.py
@@ -286,13 +286,18 @@ def getsitepackages():
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
- sitepackages.append(os.path.join(prefix, "lib",
+ sitepackages.append(os.path.join(prefix, sys.lib,
"python" + sys.version[:3],
"site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
+ if sys.lib != "lib":
+ sitepackages.append(os.path.join(prefix, "lib",
+ "python" + sys.version[:3],
+ "site-packages"))
+ sitepackages.append(os.path.join(prefix, "lib", "site-python"))
else:
sitepackages.append(prefix)
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
# locations.
Index: Python-2.7/Lib/test/test_dl.py
===================================================================
--- Python-2.7.orig/Lib/test/test_dl.py
+++ Python-2.7/Lib/test/test_dl.py
@@ -5,10 +5,11 @@
import unittest
from test.test_support import verbose, import_module
dl = import_module('dl', deprecated=True)
+import sys
sharedlibs = [
- ('/usr/lib/libc.so', 'getpid'),
- ('/lib/libc.so.6', 'getpid'),
+ ('/usr/'+sys.lib+'/libc.so', 'getpid'),
+ ('/'+sys.lib+'/libc.so.6', 'getpid'),
('/usr/bin/cygwin1.dll', 'getpid'),
('/usr/lib/libc.dylib', 'getpid'),
]
Index: Python-2.7/Lib/trace.py
===================================================================
--- Python-2.7.orig/Lib/trace.py
+++ Python-2.7/Lib/trace.py
@@ -757,10 +757,10 @@ def main(argv=None):
# should I also call expanduser? (after all, could use $HOME)
s = s.replace("$prefix",
- os.path.join(sys.prefix, "lib",
+ os.path.join(sys.prefix, sys.lib,
"python" + sys.version[:3]))
s = s.replace("$exec_prefix",
- os.path.join(sys.exec_prefix, "lib",
+ os.path.join(sys.exec_prefix, sys.lib,
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
Index: Python-2.7/Makefile.pre.in
===================================================================
--- Python-2.7.orig/Makefile.pre.in
+++ Python-2.7/Makefile.pre.in
@@ -78,6 +78,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
+LIB= @LIB@
+ARCH= @ARCH@
# Install prefix for architecture-independent files
prefix= @prefix@
@@ -530,6 +532,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
+ -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \
-o $@ $(srcdir)/Modules/getpath.c
Modules/python.o: $(srcdir)/Modules/python.c
@@ -561,7 +564,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
Python/getplatform.o: $(srcdir)/Python/getplatform.c
- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
+ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
Index: Python-2.7/Modules/getpath.c
===================================================================
--- Python-2.7.orig/Modules/getpath.c
+++ Python-2.7/Modules/getpath.c
@@ -116,9 +116,11 @@
#define EXEC_PREFIX PREFIX
#endif
+#define LIB_PYTHON LIB "/python" VERSION
+
#ifndef PYTHONPATH
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
#endif
#ifndef LANDMARK
@@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1];
static char exec_prefix[MAXPATHLEN+1];
static char progpath[MAXPATHLEN+1];
static char *module_search_path = NULL;
-static char lib_python[] = "lib/python" VERSION;
+static char lib_python[] = LIB_PYTHON;
static void
reduce(char *dir)
Index: Python-2.7/Python/getplatform.c
===================================================================
--- Python-2.7.orig/Python/getplatform.c
+++ Python-2.7/Python/getplatform.c
@@ -10,3 +10,23 @@ Py_GetPlatform(void)
{
return PLATFORM;
}
+
+#ifndef ARCH
+#define ARCH "unknown"
+#endif
+
+const char *
+Py_GetArch(void)
+{
+ return ARCH;
+}
+
+#ifndef LIB
+#define LIB "lib"
+#endif
+
+const char *
+Py_GetLib(void)
+{
+ return LIB;
+}
Index: Python-2.7/Python/sysmodule.c
===================================================================
--- Python-2.7.orig/Python/sysmodule.c
+++ Python-2.7/Python/sysmodule.c
@@ -1470,6 +1470,10 @@ _PySys_Init(void)
PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
PyString_FromString(Py_GetPlatform()));
+ SET_SYS_FROM_STRING("arch",
+ PyString_FromString(Py_GetArch()));
+ SET_SYS_FROM_STRING("lib",
+ PyString_FromString(Py_GetLib()));
SET_SYS_FROM_STRING("executable",
PyString_FromString(Py_GetProgramFullPath()));
SET_SYS_FROM_STRING("prefix",
Index: Python-2.7/configure.in
===================================================================
--- Python-2.7.orig/configure.in
+++ Python-2.7/configure.in
@@ -636,6 +636,41 @@ SunOS*)
;;
esac
+AC_SUBST(ARCH)
+AC_MSG_CHECKING(ARCH)
+ARCH=`uname -m`
+case $ARCH in
+i?86) ARCH=i386;;
+esac
+AC_MSG_RESULT($ARCH)
+
+AC_SUBST(LIB)
+AC_MSG_CHECKING(LIB)
+case $ac_sys_system in
+Linux*)
+ # Test if the compiler is 64bit
+ echo 'int i;' > conftest.$ac_ext
+ python_cv_cc_64bit_output=no
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *"ELF 64"*)
+ python_cv_cc_64bit_output=yes
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
+
+case $ARCH:$python_cv_cc_64bit_output in
+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+ LIB="lib64"
+ ;;
+*:*)
+ LIB="lib"
+ ;;
+esac
+AC_MSG_RESULT($LIB)
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
Index: Python-2.7/setup.py
===================================================================
--- Python-2.7.orig/setup.py
+++ Python-2.7/setup.py
@@ -347,7 +347,7 @@ class PyBuildExt(build_ext):
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.library_dirs, '/usr/local/' + sys.lib)
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
# Add paths specified in the environment variables LDFLAGS and
@@ -399,8 +399,7 @@ class PyBuildExt(build_ext):
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + [
- '/lib64', '/usr/lib64',
- '/lib', '/usr/lib',
+ '/' + sys.lib, '/usr/' + sys.lib,
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
@@ -643,11 +642,11 @@ class PyBuildExt(build_ext):
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
- ['/usr/lib/termcap'],
+ ['/usr/'+sys.lib+'/termcap'],
'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
- library_dirs=['/usr/lib/termcap'],
+ library_dirs=['/usr/'+sys.lib+'/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
@@ -1719,18 +1718,17 @@ class PyBuildExt(build_ext):
# Check for various platform-specific directories
if platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
- added_lib_dirs.append('/usr/openwin/lib')
+ added_lib_dirs.append('/usr/openwin/' + sys.lib)
elif os.path.exists('/usr/X11R6/include'):
include_dirs.append('/usr/X11R6/include')
- added_lib_dirs.append('/usr/X11R6/lib64')
- added_lib_dirs.append('/usr/X11R6/lib')
+ added_lib_dirs.append('/usr/X11R6/' + sys.lib)
elif os.path.exists('/usr/X11R5/include'):
include_dirs.append('/usr/X11R5/include')
- added_lib_dirs.append('/usr/X11R5/lib')
+ added_lib_dirs.append('/usr/X11R5/' + sys.lib)
else:
# Assume default location for X11
include_dirs.append('/usr/X11/include')
- added_lib_dirs.append('/usr/X11/lib')
+ added_lib_dirs.append('/usr/X11/' + sys.lib)
# If Cygwin, then verify that X is installed before proceeding
if platform == 'cygwin':
Index: Python-2.7/Lib/test/test_site.py
===================================================================
--- Python-2.7.orig/Lib/test/test_site.py
+++ Python-2.7/Lib/test/test_site.py
@@ -172,9 +172,14 @@ class HelperFunctionsTests(unittest.Test
self.assertTrue(len(dirs), 2)
wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
'site-packages')
- self.assertEquals(dirs[0], wanted)
+ self.assertTrue(wanted in dirs)
wanted = os.path.join('xoxo', 'lib', 'site-python')
- self.assertEquals(dirs[1], wanted)
+ self.assertTrue(wanted in dirs)
+ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
+ 'site-packages')
+ self.assertTrue(wanted in dirs)
+ wanted = os.path.join('xoxo', sys.lib, 'site-python')
+ self.assertTrue(wanted in dirs)
else:
self.assertTrue(len(dirs), 2)
self.assertEquals(dirs[0], 'xoxo')
Index: Python-2.7/Lib/sysconfig.py
===================================================================
--- Python-2.7.orig/Lib/sysconfig.py
+++ Python-2.7/Lib/sysconfig.py
@@ -7,10 +7,10 @@ from os.path import pardir, realpath
_INSTALL_SCHEMES = {
'posix_prefix': {
- 'stdlib': '{base}/lib/python{py_version_short}',
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
+ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}',
+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
'purelib': '{base}/lib/python{py_version_short}/site-packages',
- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
'include': '{base}/include/python{py_version_short}',
'platinclude': '{platbase}/include/python{py_version_short}',
'scripts': '{base}/bin',
@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = {
'data' : '{userbase}',
},
'posix_user': {
- 'stdlib': '{userbase}/lib/python{py_version_short}',
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
++++++ python-2.6.5-distutils_test_path.patch ++++++
--- /var/tmp/diff_new_pack.oRP13A/_old 2010-09-03 17:53:16.000000000 +0200
+++ /var/tmp/diff_new_pack.oRP13A/_new 2010-09-03 17:53:16.000000000 +0200
@@ -1,8 +1,8 @@
-Index: Python-2.6.5/Lib/distutils/tests/test_build_ext.py
+Index: Python-2.7/Lib/distutils/tests/test_build_ext.py
===================================================================
---- Python-2.6.5.orig/Lib/distutils/tests/test_build_ext.py
-+++ Python-2.6.5/Lib/distutils/tests/test_build_ext.py
-@@ -253,20 +253,14 @@ class BuildExtTestCase(support.TempdirMa
+--- Python-2.7.orig/Lib/distutils/tests/test_build_ext.py
++++ Python-2.7/Lib/distutils/tests/test_build_ext.py
+@@ -261,20 +261,14 @@ class BuildExtTestCase(support.TempdirMa
# issue #5977 : distutils build_ext.get_outputs
# returns wrong result with --inplace
@@ -27,3 +27,26 @@
cmd.compiler = None
cmd.inplace = 0
cmd.run()
+Index: Python-2.7/Lib/test/regrtest.py
+===================================================================
+--- Python-2.7.orig/Lib/test/regrtest.py
++++ Python-2.7/Lib/test/regrtest.py
+@@ -1503,16 +1503,5 @@ if __name__ == '__main__':
+ if not os.path.exists(TEMPDIR):
+ os.mkdir(TEMPDIR)
+
+- # Define a writable temp dir that will be used as cwd while running
+- # the tests. The name of the dir includes the pid to allow parallel
+- # testing (see the -j option).
+- TESTCWD = 'test_python_{}'.format(os.getpid())
+-
+- TESTCWD = os.path.join(TEMPDIR, TESTCWD)
+-
+- # Run the tests in a context manager that temporary changes the CWD to a
+- # temporary and writable directory. If it's not possible to create or
+- # change the CWD, the original CWD will be used. The original CWD is
+- # available from test_support.SAVEDCWD.
+- with test_support.temp_cwd(TESTCWD, quiet=True):
+- main()
++ # do not change directory, because it breaks distutils tests
++ main()
++++++ python-2.7-acrequire.patch ++++++
Index: Python-2.7/configure.in
===================================================================
--- Python-2.7.orig/configure.in
+++ Python-2.7/configure.in
@@ -12,7 +12,7 @@ m4_define([version_required],
[],
[m4_fatal([Autoconf version $1 is required for Python], 63)])
])
-version_required(2.65)
+dnl version_required(2.65)
AC_REVISION($Revision: 81582 $)
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
++++++ python-2.7-dirs.patch ++++++
Index: Python-2.7/Makefile.pre.in
===================================================================
--- Python-2.7.orig/Makefile.pre.in
+++ Python-2.7/Makefile.pre.in
@@ -94,7 +94,7 @@ LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/lib
+SCRIPTDIR= @libdir@
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
++++++ python-2.7rc2-canonicalize2.patch ++++++
Index: Python/sysmodule.c
===================================================================
--- Python/sysmodule.c.orig
+++ Python/sysmodule.c
@@ -1671,7 +1671,20 @@ PySys_SetArgvEx(int argc, char **argv, i
char *p = NULL;
Py_ssize_t n = 0;
PyObject *a;
-#ifdef HAVE_READLINK
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+ int errnum;
+
+ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
+ argv0 = canonicalize_file_name(argv0);
+ if (argv0 == NULL) argv0 = strdup(argv[0]);
+ }
+#elif defined(HAVE_REALPATH)
+ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
+ if (realpath(argv0, fullpath)) {
+ argv0 = fullpath;
+ }
+ }
+#elif defined(HAVE_READLINK)
char link[MAXPATHLEN+1];
char argv0copy[2*MAXPATHLEN+1];
int nr = 0;
@@ -1698,7 +1711,8 @@ PySys_SetArgvEx(int argc, char **argv, i
}
}
}
-#endif /* HAVE_READLINK */
+#endif /* resolve method selection */
+
#if SEP == '\\' /* Special case for MS filename syntax */
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
char *q;
@@ -1727,11 +1741,6 @@ PySys_SetArgvEx(int argc, char **argv, i
}
#else /* All other filename syntaxes */
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
-#if defined(HAVE_REALPATH)
- if (realpath(argv0, fullpath)) {
- argv0 = fullpath;
- }
-#endif
p = strrchr(argv0, SEP);
}
if (p != NULL) {
@@ -1749,6 +1758,9 @@ PySys_SetArgvEx(int argc, char **argv, i
a = PyString_FromStringAndSize(argv0, n);
if (a == NULL)
Py_FatalError("no mem for sys.path insertion");
+#ifdef HAVE_CANONICALIZE_FILE_NAME
+ if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) free(argv0);
+#endif /* HAVE_CANONICALIZE_FILE_NAME */
if (PyList_Insert(path, 0, a) < 0)
Py_FatalError("sys.path.insert(0) failed");
Py_DECREF(a);
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -2728,7 +2728,7 @@ AC_CHECK_FUNCS(alarm setitimer getitimer
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \
mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
+ putenv readlink realpath canonicalize_file_name \
select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \
setgid \
setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
Index: pyconfig.h.in
===================================================================
--- pyconfig.h.in.orig
+++ pyconfig.h.in
@@ -97,6 +97,9 @@
/* Define to 1 if you have the `chflags' function. */
#undef HAVE_CHFLAGS
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+#undef HAVE_CANONICALIZE_FILE_NAME
+
/* Define to 1 if you have the `chown' function. */
#undef HAVE_CHOWN
++++++ python-2.7rc2-configure.patch ++++++
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -3892,9 +3892,18 @@ then
fi
# check for readline 4.0
-AC_CHECK_LIB(readline, rl_pre_input_hook,
- AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
- [Define if you have readline 4.0]), ,$READLINE_LIBS)
+AC_MSG_CHECKING([for rl_pre_input_hook in -lreadline])
+AC_CACHE_VAL(ac_cv_have_rl_re_input_hook, [
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include