This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 19df835c89b6c9bbc578814212cba029fe5eb5a6 (commit) via 0539d2622daec702dac23624d0cf5a2d41f77122 (commit) via e20320254a902df16e22af8260e25d15cd92e1ab (commit) via 389f1dce65df0d82d7c51db8fe3274662cbded74 (commit) via 640a1a653d94f579d6198110be0edfe5d5910192 (commit) via e626536c67aae2fba8c63b2b9995f779eb8428f1 (commit) via 8988c7e14bba2fc2dbd4322fd13e4d3ab3b7ea7b (commit) via 309b91c8e4b679fed9111b82a26ac236c401673a (commit) via 01a714f74bd0c552794a2b065536c5d40d88f143 (commit) via c1114c6b708008f7fa14091e08ef7640bd2292f9 (commit) via 706fb4da889d0996f6d531a85c788cf7630ace9c (commit) via 3b5742539576768fe0c95839341afbf9a4c3a885 (commit) via e5e11179ad372f85efebf832c1a8ea85a47d2121 (commit) via dc21a2afb5d150fae1308482320231e85e6080d7 (commit) via db327fe8226259791263d501dcd112f288570f64 (commit) via 666c90e9d88df07446d6fa6a4a171a495859e7b5 (commit) via 99e691670bfa2038e096cdb9d976fcba45f6072f (commit) via 887bbd54df89c45730ede2636b695871a5380867 (commit) from 8c1983ef6a80689b4db587785ef4d5f00dce0a4e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 19df835c89b6c9bbc578814212cba029fe5eb5a6 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:48 2011 +0100
procps: Make package work on x86_64.
commit 0539d2622daec702dac23624d0cf5a2d41f77122 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:48 2011 +0100
popt: Make package work on x86_64.
commit e20320254a902df16e22af8260e25d15cd92e1ab Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:47 2011 +0100
perl: Make package work on x86_64.
commit 389f1dce65df0d82d7c51db8fe3274662cbded74 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:47 2011 +0100
patch: Make package work on x86_64.
commit 640a1a653d94f579d6198110be0edfe5d5910192 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:47 2011 +0100
pakfire: Make package work on x86_64.
commit e626536c67aae2fba8c63b2b9995f779eb8428f1 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:43 2011 +0100
libsepol: Make package work on x86_64.
commit 8988c7e14bba2fc2dbd4322fd13e4d3ab3b7ea7b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:42 2011 +0100
libidn: Make package work on x86_64.
commit 309b91c8e4b679fed9111b82a26ac236c401673a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:41 2011 +0100
libcap: Make package work on x86_64.
commit 01a714f74bd0c552794a2b065536c5d40d88f143 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:40 2011 +0100
help2man: Make package work on x86_64.
commit c1114c6b708008f7fa14091e08ef7640bd2292f9 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:40 2011 +0100
gnutls: Make package work on x86_64.
commit 706fb4da889d0996f6d531a85c788cf7630ace9c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:39 2011 +0100
glibc: Make package work on x86_64.
commit 3b5742539576768fe0c95839341afbf9a4c3a885 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:39 2011 +0100
gdbm: Make package work on x86_64.
commit e5e11179ad372f85efebf832c1a8ea85a47d2121 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:39 2011 +0100
expat: Make package work on x86_64.
commit dc21a2afb5d150fae1308482320231e85e6080d7 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:38 2011 +0100
elfutils: Make package work on x86_64.
commit db327fe8226259791263d501dcd112f288570f64 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:37 2011 +0100
db4: Make package work on x86_64.
commit 666c90e9d88df07446d6fa6a4a171a495859e7b5 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:46:37 2011 +0100
cracklib: Make package work on x86_64.
commit 99e691670bfa2038e096cdb9d976fcba45f6072f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:43:27 2011 +0100
python: Make package ready for x86_64.
commit 887bbd54df89c45730ede2636b695871a5380867 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 23 14:32:33 2011 +0100
bzip2: Fix some errors in the makefile.
-----------------------------------------------------------------------
Summary of changes: bzip2/bzip2.nm | 15 +- cracklib/cracklib.nm | 8 +- db4/db4.nm | 11 +- elfutils/elfutils.nm | 10 +- expat/expat.nm | 11 +- gdbm/gdbm.nm | 5 +- glibc/glibc.nm | 26 ++-- gnutls/gnutls.nm | 1 + help2man/help2man.nm | 6 +- libcap/libcap.nm | 12 +- libidn/libidn.nm | 13 +- libsepol/libsepol.nm | 5 +- pakfire/pakfire.nm | 12 +- patch/patch.nm | 6 +- perl/perl.nm | 8 +- popt/popt.nm | 11 +- procps/procps.nm | 4 +- python/patches/python-2.7.1-config.patch | 281 ++++++++++++++++++++++++++++++ python/python-2.7-lib64-sysconfig.patch | 44 +++++ python/python-2.7.1-lib64.patch | 199 +++++++++++++++++++++ python/python.nm | 8 +- 21 files changed, 615 insertions(+), 81 deletions(-) create mode 100644 python/patches/python-2.7.1-config.patch create mode 100644 python/python-2.7-lib64-sysconfig.patch create mode 100644 python/python-2.7.1-lib64.patch
Difference in files: diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm index 44b0dd2..e1af92f 100644 --- a/bzip2/bzip2.nm +++ b/bzip2/bzip2.nm @@ -5,7 +5,7 @@
name = bzip2 version = 1.0.6 -release = 4 +release = 5
groups = Applications/Compression url = http://www.bzip.org/ @@ -37,8 +37,8 @@ build
install # Install binaries. - mkdir -pv %{BUILDROOT}/bin - cp -v bzip2-shared %{BUILDROOT}/bin/bzip2 + mkdir -pv %{BUILDROOT}%{bindir} + cp -v bzip2-shared %{BUILDROOT}%{bindir}/bzip2 ln -svf bzip2 %{BUILDROOT}%{bindir}/bunzip2 ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcat ln -svf bzip2 %{BUILDROOT}%{bindir}/bzcmp @@ -47,21 +47,22 @@ build # Install libs. mkdir -pv %{BUILDROOT}%{libdir} %{BUILDROOT}/%{lib} install -m 755 libbz2.so.%{version} %{BUILDROOT}/%{lib} - ln -svf libbz2.so.%{version} %{BUILDROOT}/lib/libbz2.so.1 - ln -svf ../../lib/libbz2.so.1.0 %{BUILDROOT}%{libdir}/libbz2.so + ln -svf libbz2.so.%{version} %{BUILDROOT}/%{lib}/libbz2.so.1 + ln -svf ../../%{lib}/libbz2.so.1 %{BUILDROOT}%{libdir}/libbz2.so
# Install headers. mkdir -pv %{BUILDROOT}%{includedir} install -m 644 bzlib.h %{BUILDROOT}%{includedir}
# Install man pages. - mkdir -pv %{BUIDLROOT}%{mandir}/man1 + mkdir -pv %{BUILDROOT}%{mandir}/man1 cp -vp bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 %{BUILDROOT}%{mandir}/man1 + chown root.root -v %{BUILDROOT}%{mandir}/man1/* ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bzip2recover.1 ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bunzip2.1 ln -svf bzip2.1 %{BUILDROOT}%{mandir}/man1/bzcat.1 ln -svf bzdiff.1 %{BUILDROOT}%{mandir}/man1/bzcmp.1 - ln -svf bzmore2.1 %{BUILDROOT}%{mandir}/man1/bzless.1 + ln -svf bzmore.1 %{BUILDROOT}%{mandir}/man1/bzless.1 end end
diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm index f008a9b..12790b6 100644 --- a/cracklib/cracklib.nm +++ b/cracklib/cracklib.nm @@ -5,7 +5,7 @@
name = cracklib version = 2.8.12 -release = 1 +release = 2
groups = Security/Password url = http://sourceforge.net/projects/cracklib/ @@ -44,9 +44,9 @@ build end
install_cmds - mkdir -pv %{BUILDROOT}/{,usr/}lib - mv -v %{BUILDROOT}/usr/lib/libcrack.so.2* %{BUILDROOT}/lib - ln -vsf ../../lib/libcrack.so.2.8.0 %{BUILDROOT}/usr/lib/libcrack.so + mkdir -pv %{BUILDROOT}/{,usr/}%{lib} + mv -v %{BUILDROOT}%{libdir}/libcrack.so.2* %{BUILDROOT}/%{lib} + ln -vsf ../../%{lib}/libcrack.so.2.8.0 %{BUILDROOT}%{libdir}/libcrack.so
mkdir -pv %{BUILDROOT}/usr/share/dict install -v -m644 -D %{DIR_DL}/cracklib-words-20080507.gz \ diff --git a/db4/db4.nm b/db4/db4.nm index 3fd97eb..0613b24 100644 --- a/db4/db4.nm +++ b/db4/db4.nm @@ -7,7 +7,7 @@ name = db4 version_major = 4.8 version_minor = 30 version = %{version_major}.%{version_minor} -release = 2 +release = 3 epoch = 1 thisapp = db-%{version}
@@ -35,11 +35,13 @@ build cd %{DIR_APP}/build_unix CC=gcc \ ../dist/configure \ - --prefix=/usr \ + %{configure_options} \ --enable-compat185 \ --enable-cxx \ --disable-static
+ %{MACRO_FIX_LIBTOOL} + make %{PARALLELISMFLAGS} end
@@ -59,8 +61,7 @@ packages # Overwrite because of epoch != 0. requires = %{name}=%{epoch}:%{thisver}
- files += \ - !/usr/lib*/libdb-%{version_major}.so + files += !%{libdir}/libdb-%{version_major}.so end
package db4-utils @@ -77,7 +78,7 @@ packages description = %{summary}
files - /usr/lib*/libdb_cxx-%{version_major}.so + %{libdir}/libdb_cxx-%{version_major}.so end end
diff --git a/elfutils/elfutils.nm b/elfutils/elfutils.nm index a56e6bc..df15cc4 100644 --- a/elfutils/elfutils.nm +++ b/elfutils/elfutils.nm @@ -5,7 +5,7 @@
name = elfutils version = 0.152 -release = 3 +release = 4
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Libraries @@ -51,7 +51,7 @@ end
quality-agent whitelist_rpath - /usr/lib/elfutils + %{libdir}/elfutils end end
@@ -61,14 +61,14 @@ packages package %{name}-devel template DEVEL
- requires = %{name}=%{thisver} %{name}-libs=%{thisver} + requires = %{name}=%{thisver}, %{name}-libs=%{thisver} end
package %{name}-libs template LIBS
- files += /usr/lib*/lib*%{version}.so - files += /usr/lib/elfutils + files += %{libdir}/lib*%{version}.so + files += %{libdir}/elfutils end
package %{name}-debuginfo diff --git a/expat/expat.nm b/expat/expat.nm index d03a8bc..535a79a 100644 --- a/expat/expat.nm +++ b/expat/expat.nm @@ -5,7 +5,7 @@
name = expat version = 2.0.1 -release = 1 +release = 2
groups = System/Libraries url = http://www.libexpat.org/ @@ -25,13 +25,12 @@ source_dl =
build configure_options += \ - --libdir=/lib \ - --mandir=/usr/share + --libdir=/%{lib}
install_cmds - rm -vf %{BUILDROOT}/lib/libexpat.so - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libexpat.so.1 %{BUILDROOT}/usr/lib/libexpat.so + rm -vf %{BUILDROOT}/%{lib}/libexpat.so + mkdir -pv %{BUILDROOT}%{libdir} + ln -svf ../../%{lib}/libexpat.so.1 %{BUILDROOT}%{libdir}/libexpat.so end end
diff --git a/gdbm/gdbm.nm b/gdbm/gdbm.nm index 9362e70..9ba6900 100644 --- a/gdbm/gdbm.nm +++ b/gdbm/gdbm.nm @@ -5,7 +5,7 @@
name = gdbm version = 1.8.3 -release = 1 +release = 2
groups = Development/Tools url = http://www.gnu.org/software/gdbm/ @@ -22,8 +22,6 @@ end source_dl =
build - configure_options += --mandir=/usr/share/man - prepare_cmds sed -i Makefile.* \ -e "s/^BINOWN = .*/BINOWN = root/" \ @@ -37,7 +35,6 @@ end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/glibc/glibc.nm b/glibc/glibc.nm index a451dee..aa40547 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -46,11 +46,13 @@ build end
# Build glibc with custom cflags - GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -DPIC + GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -fPIC -DPIC
if "%{DISTRO_ARCH}" == "i686" GLIBC_FLAGS += -march=i686 -mtune=generic - elif "%{DISTRO_ARCH}" == "x86_64" + end + + if "%{DISTRO_ARCH}" == "x86_64" GLIBC_FLAGS += -mtune=generic end
@@ -146,7 +148,7 @@ build configure_options = \ --build=%{DISTRO_BUILDTARGET} \ --prefix=/usr \ - --libexecdir=/usr/lib/glibc \ + --libexecdir=%{libdir}/glibc \ --disable-profile \ --enable-add-ons \ --enable-kernel=%{OPTIMIZED_KERNEL} \ @@ -224,18 +226,18 @@ build rm -vf %{BUILDROOT}/etc/ld.so.cache
# Include /usr/lib/gconv/gconv-modules.cache - > %{BUILDROOT}/usr/lib/gconv/gconv-modules.cache - chmod 644 %{BUILDROOT}/usr/lib/gconv/gconv-modules.cache + > %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache + chmod 644 %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache
- strip -g %{BUILDROOT}/usr/lib/*.o + strip -g %{BUILDROOT}%{libdir}/*.o
# Move some libs to correct place - mv -v %{BUILDROOT}/lib/lib{memusage,pcprofile}.so %{BUILDROOT}/usr/lib/ + mv -v %{BUILDROOT}/%{lib}/lib{memusage,pcprofile}.so %{BUILDROOT}%{libdir} end
keep_libraries - /usr/lib/libc_nonshared.a - /usr/lib/libpthread_nonshared.a + %{libdir}/libc_nonshared.a + %{libdir}/libpthread_nonshared.a end end
@@ -274,7 +276,7 @@ packages
requires = glibc-headers=%{thisver}
- files = /usr/lib/*.a /usr/lib/*.o + files = %{libdir}/*.a %{libdir}/*.o end
package glibc-headers @@ -327,8 +329,8 @@ packages /usr/bin/mtrace /usr/bin/pcprofiledump /usr/bin/xtrace - /usr/lib/libmemusage.so - /usr/lib/libpcprofile.so + %{libdir}/libmemusage.so + %{libdir}/libpcprofile.so end end
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 5f78089..2b2912e 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -26,6 +26,7 @@ build requires libtasn1-devel nettle-devel>=2.4 + perl p11-kit-devel>=0.4 zlib-devel end diff --git a/help2man/help2man.nm b/help2man/help2man.nm index a1ded21..3b54d46 100644 --- a/help2man/help2man.nm +++ b/help2man/help2man.nm @@ -5,7 +5,7 @@
name = help2man version = 1.40.4 -release = 1 +release = 2
groups = Development/Tools url = http://www.gnu.org/software/help2man @@ -24,6 +24,10 @@ end source_dl =
build + requires + perl + end + configure_options += \ --disable-nls \ --libdir=/usr/lib/help2man diff --git a/libcap/libcap.nm b/libcap/libcap.nm index a094f1e..a4bd162 100644 --- a/libcap/libcap.nm +++ b/libcap/libcap.nm @@ -5,7 +5,7 @@
name = libcap version = 2.22 -release = 1 +release = 2
groups = System/Libraries url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/ @@ -33,13 +33,13 @@ build end
install - make install DESTDIR=%{BUILDROOT} lib=/lib + make install DESTDIR=%{BUILDROOT} lib=/%{lib}
- rm -vf %{BUILDROOT}/lib/libcap.so - mkdir -pv %{BUILDROOT}/usr/lib - ln -svf ../../lib/libcap.so.2 %{BUILDROOT}/usr/lib/libcap.so + rm -vf %{BUILDROOT}/%{lib}/libcap.so + mkdir -pv %{BUILDROOT}%{libdir} + ln -svf ../../%{lib}/libcap.so.2 %{BUILDROOT}%{libdir}/libcap.so
- chmod 755 %{BUILDROOT}/lib/libcap.so.%{version} + chmod 755 %{BUILDROOT}/%{lib}/libcap.so.%{version} end end
diff --git a/libidn/libidn.nm b/libidn/libidn.nm index 7de885f..1941920 100644 --- a/libidn/libidn.nm +++ b/libidn/libidn.nm @@ -5,7 +5,7 @@
name = libidn version = 1.22 -release = 1 +release = 2
groups = System/Libraries url = http://www.gnu.org/software/libidn/ @@ -23,7 +23,7 @@ source_dl =
build configure_options += \ - --libdir=/lib \ + --libdir=/%{lib} \ --disable-csharp \ --disable-static
@@ -33,17 +33,16 @@ build
install make install DESTDIR=%{BUILDROOT} \ - pkgconfigdir=/usr/lib/pkgconfig + pkgconfigdir=%{libdir}/pkgconfig
- mkdir -pv %{BUILDROOT}/usr/lib - rm -vf %{BUILDROOT}/lib/libidn.so - ln -svf ../../lib/libidn.so.11.6.5 %{BUILDROOT}/usr/lib/libidn.so + mkdir -pv %{BUILDROOT}%{libdir} + rm -vf %{BUILDROOT}/%{lib}/libidn.so + ln -svf ../../%{lib}/libidn.so.11.6.5 %{BUILDROOT}%{libdir}/libidn.so end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm index ee6efd1..fd2605f 100644 --- a/libsepol/libsepol.nm +++ b/libsepol/libsepol.nm @@ -5,7 +5,7 @@
name = libsepol version = 2.0.41 -release = 1 +release = 2
groups = System/Libraries url = http://www.selinuxproject.org @@ -26,6 +26,9 @@ build make CFLAGS="%{CFLAGS}" %{PARALELLISMFLAGS} end
+ make_install_targets += LIBDIR="%{BUILDROOT}%{libdir}" \ + SHLIBDIR="%{BUILDROOT}/%{lib}" + install_cmds # Remove binaries rm -rf %{BUILDROOT}/usr/bin diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 3cb1f12..8292df0 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -33,7 +33,7 @@ build end
# libgomp was broken in earlier releases. - requires += gcc>=4.6.2-4 beecrypt>=4.2.1-2 + requires += gcc>=4.6.2-4, beecrypt>=4.2.1-2
CFLAGS += -fno-strict-aliasing
@@ -60,7 +60,7 @@ packages
files /usr/lib/pakfire/pakfire-multicall.py - /usr/lib*/python*/site-packages/pakfire* + %{libdir}/python*/site-packages/pakfire* /usr/share/locale end end @@ -84,7 +84,7 @@ packages conflicts = build-essentials
files - /usr/lib/libpakfire_preload.so + %{libdir}/libpakfire_preload.so /usr/bin/pakfire-builder /usr/bin/pakfire-server /usr/lib/pakfire/* @@ -107,7 +107,11 @@ packages /usr/lib/pakfire/quality-agent* end
- requires = binutils file grep + requires + binutils + file + grep + end end
package %{name}-debuginfo diff --git a/patch/patch.nm b/patch/patch.nm index ecdafac..1dfa927 100644 --- a/patch/patch.nm +++ b/patch/patch.nm @@ -5,7 +5,7 @@
name = patch version = 2.6.1 -release = 2 +release = 3
groups = Development/Tools url = http://www.gnu.org/software/patch/patch.html @@ -34,10 +34,6 @@ build test make check end - - install - make install prefix=%{BUILDROOT}/usr - end end
packages diff --git a/perl/perl.nm b/perl/perl.nm index 9a221fa..253b4c7 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -34,7 +34,6 @@ build gcc-c++ gdbm-devel iana-etc - perl procps zlib-devel end @@ -122,12 +121,11 @@ end # of this perl package. perl_requires := %{name}=%{thisver}
-perl_filter_requires - perl>=[0-9]:.* -end - packages package perl + # Increase epoch because of automatic dependencies. + epoch = 2 + requires perl-libs=%{thisver} perl(Carp) diff --git a/popt/popt.nm b/popt/popt.nm index 9407ce2..5bf894a 100644 --- a/popt/popt.nm +++ b/popt/popt.nm @@ -5,7 +5,7 @@
name = popt version = 1.15 -release = 1 +release = 2
groups = System/Libraries url = http://www.rpm5.org/ @@ -22,18 +22,17 @@ source_dl =
build configure_options += \ - --libdir=/lib \ + --libdir=/%{lib}
install_cmds - mkdir -pv %{BUILDROOT}/usr/lib - rm -vf %{BUILDROOT}/lib/libpopt.so - ln -sfv ../../lib/libpopt.so.0.0.0 %{BUILDROOT}/usr/lib/libpopt.so + mkdir -pv %{BUILDROOT}%{libdir} + rm -vf %{BUILDROOT}/%{lib}/libpopt.so + ln -sfv ../../%{lib}/libpopt.so.0.0.0 %{BUILDROOT}%{libdir}/libpopt.so end end
packages package %{name} - end
package %{name}-devel template DEVEL diff --git a/procps/procps.nm b/procps/procps.nm index 24748a4..817a4f1 100644 --- a/procps/procps.nm +++ b/procps/procps.nm @@ -5,7 +5,7 @@
name = procps version = 3.2.8 -release = 3 +release = 4
groups = Applications/System url = http://procps.sourceforge.net/ @@ -35,7 +35,7 @@ build SKIP="/bin/kill /usr/share/man/man1/kill.1"
install_cmds - chmod -R 755 %{BUILDROOT}/{bin,lib,sbin} + chmod -R 755 %{BUILDROOT}/{bin,%{lib},sbin} end end
diff --git a/python/patches/python-2.7.1-config.patch b/python/patches/python-2.7.1-config.patch new file mode 100644 index 0000000..0bb790e --- /dev/null +++ b/python/patches/python-2.7.1-config.patch @@ -0,0 +1,281 @@ +diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dist +--- Python-2.7.1/Modules/Setup.dist.rhconfig 2010-08-21 07:40:30.000000000 -0400 ++++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:47:12.111059967 -0500 +@@ -153,7 +153,7 @@ GLHACK=-Dclear=__GLclear + # 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 +@@ -163,73 +163,73 @@ GLHACK=-Dclear=__GLclear + # 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 -ltermcap + + + # Modules that should always be present (non UNIX dependent): + +-#array arraymodule.c # array objects +-#cmath cmathmodule.c _math.c # -lm # complex math library functions +-#math mathmodule.c _math.c # -lm # math library functions, e.g. sin() +-#_struct _struct.c # binary structure packing/unpacking +-#time timemodule.c # -lm # time operations and variables +-#operator operator.c # operator.add() and similar goodies +-#_testcapi _testcapimodule.c # Python C API test module +-#_random _randommodule.c # Random number generator +-#_collections _collectionsmodule.c # Container types +-#itertools itertoolsmodule.c # Functions creating iterators for efficient looping +-#strop stropmodule.c # String manipulations +-#_functools _functoolsmodule.c # Tools for working with functions and callable objects ++array arraymodule.c # array objects ++cmath cmathmodule.c _math.c # -lm # complex math library functions ++math mathmodule.c _math.c # -lm # math library functions, e.g. sin() ++_struct _struct.c # binary structure packing/unpacking ++time timemodule.c # -lm # time operations and variables ++operator operator.c # operator.add() and similar goodies ++_testcapi _testcapimodule.c # Python C API test module ++_random _randommodule.c # Random number generator ++_collections _collectionsmodule.c # Container types ++itertools itertoolsmodule.c # Functions creating iterators for efficient looping ++strop stropmodule.c # String manipulations ++_functools _functoolsmodule.c # Tools for working with functions and callable objects + #_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator + #_pickle _pickle.c # pickle accelerator + #datetime datetimemodule.c # date/time type +-#_bisect _bisectmodule.c # Bisection algorithms ++_bisect _bisectmodule.c # Bisection algorithms + +-#unicodedata unicodedata.c # static Unicode character database ++unicodedata unicodedata.c # static Unicode character database + + # access to ISO C locale support +-#_locale _localemodule.c # -lintl ++_locale _localemodule.c # -lintl + + + # Modules with some UNIX dependencies -- on by default: + # (If you have a really backward UNIX, select and socket may not be + # supported...) + +-#fcntl fcntlmodule.c # fcntl(2) and ioctl(2) +-#spwd spwdmodule.c # spwd(3) +-#grp grpmodule.c # grp(3) +-#select selectmodule.c # select(2); not on ancient System V ++fcntl fcntlmodule.c # fcntl(2) and ioctl(2) ++spwd spwdmodule.c # spwd(3) ++grp grpmodule.c # grp(3) ++select selectmodule.c # select(2); not on ancient System V + + # Memory-mapped files (also works on Win32). +-#mmap mmapmodule.c ++mmap mmapmodule.c + + # CSV file helper +-#_csv _csv.c ++_csv _csv.c + + # Socket module helper for socket(2) +-#_socket socketmodule.c ++_socket socketmodule.c + + # Socket module helper for SSL support; you must comment out the other + # socket line above, and possibly edit the SSL variable: + #SSL=/usr/local/ssl +-#_ssl _ssl.c \ +-# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +-# -L$(SSL)/lib -lssl -lcrypto ++_ssl _ssl.c \ ++ -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ ++ -L$(SSL)/lib -lssl -lcrypto + + # The crypt module is now disabled by default because it breaks builds + # on many systems (where -lcrypt is needed), e.g. Linux (I believe). + # + # First, look at Setup.config; configure may have set this for you. + +-#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems ++crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems + + + # Some more UNIX dependent modules -- off by default, since these + # are not supported by all UNIX systems: + +-#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere +-#termios termios.c # Steen Lumholt's termios module +-#resource resource.c # Jeremy Hylton's rlimit interface ++nis nismodule.c -lnsl # Sun yellow pages -- not everywhere ++termios termios.c # Steen Lumholt's termios module ++resource resource.c # Jeremy Hylton's rlimit interface + + + # Multimedia modules -- off by default. +@@ -237,8 +237,8 @@ GLHACK=-Dclear=__GLclear + # #993173 says audioop works on 64-bit platforms, though. + # These represent audio samples or images as strings: + +-#audioop audioop.c # Operations on audio samples +-#imageop imageop.c # Operations on images ++audioop audioop.c # Operations on audio samples ++imageop imageop.c # Operations on images + + + # Note that the _md5 and _sha modules are normally only built if the +@@ -248,14 +248,14 @@ GLHACK=-Dclear=__GLclear + # Message-Digest Algorithm, described in RFC 1321. The necessary files + # md5.c and md5.h are included here. + +-#_md5 md5module.c md5.c ++_md5 md5module.c md5.c + + + # The _sha module implements the SHA checksum algorithms. + # (NIST's Secure Hash Algorithms.) +-#_sha shamodule.c +-#_sha256 sha256module.c +-#_sha512 sha512module.c ++_sha shamodule.c ++_sha256 sha256module.c ++_sha512 sha512module.c + + + # SGI IRIX specific modules -- off by default. +@@ -302,12 +302,12 @@ GLHACK=-Dclear=__GLclear + # A Linux specific module -- off by default; this may also work on + # some *BSDs. + +-#linuxaudiodev linuxaudiodev.c ++linuxaudiodev linuxaudiodev.c + + + # George Neville-Neil's timing module: + +-#timing timingmodule.c ++timing timingmodule.c + + + # The _tkinter module. +@@ -322,7 +322,7 @@ GLHACK=-Dclear=__GLclear + # every system. + + # *** Always uncomment this (leave the leading underscore in!): +-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ ++_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ + # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: + # -L/usr/local/lib \ + # *** Uncomment and edit to reflect where your Tcl/Tk headers are: +@@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear + # *** Or uncomment this for Solaris: + # -I/usr/openwin/include \ + # *** Uncomment and edit for Tix extension only: +-# -DWITH_TIX -ltix8.1.8.2 \ ++ -DWITH_TIX -ltix \ + # *** Uncomment and edit for BLT extension only: + # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ + # *** Uncomment and edit for PIL (TkImaging) extension only: +@@ -341,7 +341,7 @@ GLHACK=-Dclear=__GLclear + # *** Uncomment and edit for TOGL extension only: + # -DWITH_TOGL togl.c \ + # *** Uncomment and edit to reflect your Tcl/Tk versions: +-# -ltk8.2 -ltcl8.2 \ ++ -ltk -ltcl \ + # *** Uncomment and edit to reflect where your X11 libraries are: + # -L/usr/X11R6/lib \ + # *** Or uncomment this for Solaris: +@@ -351,7 +351,7 @@ GLHACK=-Dclear=__GLclear + # *** Uncomment for AIX: + # -lld \ + # *** Always uncomment this; X11 libraries to link with: +-# -lX11 ++ -lX11 + + # Lance Ellinghaus's syslog module + #syslog syslogmodule.c # syslog daemon interface +@@ -373,7 +373,7 @@ GLHACK=-Dclear=__GLclear + # it is a highly experimental and dangerous device for calling + # *arbitrary* C functions in *arbitrary* shared libraries: + +-#dl dlmodule.c ++dl dlmodule.c + + + # Modules that provide persistent dictionary-like semantics. You will +@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear + # + # 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. +@@ -411,11 +411,10 @@ GLHACK=-Dclear=__GLclear + # + # 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) ++DBLIBVER=4.7 ++DBINC=/usr/include/db4 ++DBLIB=/usr/lib ++_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + + # Historical Berkeley DB 1.85 + # +@@ -430,14 +429,14 @@ GLHACK=-Dclear=__GLclear + + + # Helper module for various ascii-encoders +-#binascii binascii.c ++binascii binascii.c + + # Fred Drake's interface to the Python parser +-#parser parsermodule.c ++parser parsermodule.c + + # cStringIO and cPickle +-#cStringIO cStringIO.c +-#cPickle cPickle.c ++cStringIO cStringIO.c ++cPickle cPickle.c + + + # Lee Busby's SIGFPE modules. +@@ -460,7 +459,7 @@ GLHACK=-Dclear=__GLclear + # Andrew Kuchling's zlib module. + # This require zlib 1.1.3 (or later). + # See http://www.gzip.org/zlib/ +-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz ++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz + + # Interface to the Expat XML parser + # +@@ -479,14 +478,14 @@ GLHACK=-Dclear=__GLclear + # Hye-Shik Chang's CJKCodecs + + # multibytecodec is required for all the other CJK codec modules +-#_multibytecodec cjkcodecs/multibytecodec.c ++_multibytecodec cjkcodecs/multibytecodec.c + +-#_codecs_cn cjkcodecs/_codecs_cn.c +-#_codecs_hk cjkcodecs/_codecs_hk.c +-#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c +-#_codecs_jp cjkcodecs/_codecs_jp.c +-#_codecs_kr cjkcodecs/_codecs_kr.c +-#_codecs_tw cjkcodecs/_codecs_tw.c ++_codecs_cn cjkcodecs/_codecs_cn.c ++_codecs_hk cjkcodecs/_codecs_hk.c ++_codecs_iso2022 cjkcodecs/_codecs_iso2022.c ++_codecs_jp cjkcodecs/_codecs_jp.c ++_codecs_kr cjkcodecs/_codecs_kr.c ++_codecs_tw cjkcodecs/_codecs_tw.c + + # Example -- included for reference only: + # xx xxmodule.c diff --git a/python/python-2.7-lib64-sysconfig.patch b/python/python-2.7-lib64-sysconfig.patch new file mode 100644 index 0000000..0cef361 --- /dev/null +++ b/python/python-2.7-lib64-sysconfig.patch @@ -0,0 +1,44 @@ +diff -up Python-2.7/Lib/sysconfig.py.lib64-sysconfig Python-2.7/Lib/sysconfig.py +--- Python-2.7/Lib/sysconfig.py.lib64-sysconfig 2010-07-08 14:18:41.386898476 -0400 ++++ Python-2.7/Lib/sysconfig.py 2010-07-08 14:22:02.837896461 -0400 +@@ -7,20 +7,20 @@ 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}/lib64/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib64/python{py_version_short}', + 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', + 'data': '{base}', + }, + 'posix_home': { +- 'stdlib': '{base}/lib/python', +- 'platstdlib': '{base}/lib/python', ++ 'stdlib': '{base}/lib64/python', ++ 'platstdlib': '{base}/lib64/python', + 'purelib': '{base}/lib/python', +- 'platlib': '{base}/lib/python', ++ 'platlib': '{base}/lib64/python', + 'include': '{base}/include/python', + 'platinclude': '{base}/include/python', + '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}/lib64/python{py_version_short}', ++ 'platstdlib': '{userbase}/lib64/python{py_version_short}', + 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', diff --git a/python/python-2.7.1-lib64.patch b/python/python-2.7.1-lib64.patch new file mode 100644 index 0000000..4b07470 --- /dev/null +++ b/python/python-2.7.1-lib64.patch @@ -0,0 +1,199 @@ +diff -up Python-2.7.1/Lib/distutils/command/install.py.lib64 Python-2.7.1/Lib/distutils/command/install.py +--- Python-2.7.1/Lib/distutils/command/install.py.lib64 2010-05-05 15:09:31.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/command/install.py 2010-12-23 15:51:19.422062062 -0500 +@@ -42,14 +42,14 @@ 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/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { + 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff -up Python-2.7.1/Lib/distutils/sysconfig.py.lib64 Python-2.7.1/Lib/distutils/sysconfig.py +--- Python-2.7.1/Lib/distutils/sysconfig.py.lib64 2010-11-06 10:16:30.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/sysconfig.py 2010-12-23 15:51:19.423063652 -0500 +@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": ++ if plat_specific or standard_lib: ++ lib = "lib64" ++ else: ++ lib = "lib" + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ lib, "python" + get_python_version()) + if standard_lib: + return libpython + else: +diff -up Python-2.7.1/Lib/site.py.lib64 Python-2.7.1/Lib/site.py +--- Python-2.7.1/Lib/site.py.lib64 2010-10-12 18:53:51.000000000 -0400 ++++ Python-2.7.1/Lib/site.py 2010-12-23 15:51:19.424063606 -0500 +@@ -290,12 +290,16 @@ 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, "lib64", ++ "python" + sys.version[:3], ++ "site-packages")) + 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, "lib64", "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple +diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_site.py +--- Python-2.7.1/Lib/test/test_site.py.lib64 2010-11-21 08:34:58.000000000 -0500 ++++ Python-2.7.1/Lib/test/test_site.py 2010-12-23 15:55:19.782935931 -0500 +@@ -169,17 +169,20 @@ class HelperFunctionsTests(unittest.Test + wanted = os.path.join('xoxo', 'Lib', 'site-packages') + self.assertEqual(dirs[0], wanted) + elif os.sep == '/': +- self.assertEqual(len(dirs), 2) ++ self.assertEquals(len(dirs), 3) ++ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], ++ 'site-packages') ++ self.assertEquals(dirs[0], wanted) + wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], + 'site-packages') +- self.assertEqual(dirs[0], wanted) ++ self.assertEquals(dirs[1], wanted) + wanted = os.path.join('xoxo', 'lib', 'site-python') +- self.assertEqual(dirs[1], wanted) ++ self.assertEquals(dirs[2], wanted) + else: +- self.assertEqual(len(dirs), 2) +- self.assertEqual(dirs[0], 'xoxo') +- wanted = os.path.join('xoxo', 'lib', 'site-packages') +- self.assertEqual(dirs[1], wanted) ++ self.assertEquals(len(dirs), 2) ++ self.assertEquals(dirs[0], 'xoxo') ++ wanted = os.path.join('xoxo', 'lib64', 'site-packages') ++ self.assertEquals(dirs[1], wanted) + + # let's try the specific Apple location + if (sys.platform == "darwin" and +diff -up Python-2.7.1/Makefile.pre.in.lib64 Python-2.7.1/Makefile.pre.in +--- Python-2.7.1/Makefile.pre.in.lib64 2010-12-23 15:51:19.407063264 -0500 ++++ Python-2.7.1/Makefile.pre.in 2010-12-23 15:51:19.426063917 -0500 +@@ -94,7 +94,7 @@ LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= $(prefix)/lib64 + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) +diff -up Python-2.7.1/Modules/getpath.c.lib64 Python-2.7.1/Modules/getpath.c +--- Python-2.7.1/Modules/getpath.c.lib64 2010-10-07 19:37:08.000000000 -0400 ++++ Python-2.7.1/Modules/getpath.c 2010-12-23 15:51:19.427063291 -0500 +@@ -117,8 +117,8 @@ + #endif + + #ifndef PYTHONPATH +-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ +- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ ++ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" + #endif + + #ifndef LANDMARK +@@ -129,7 +129,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[] = "lib64/python" VERSION; + + static void + reduce(char *dir) +@@ -528,7 +528,7 @@ calculate_path(void) + } + else + strncpy(zip_path, PREFIX, MAXPATHLEN); +- joinpath(zip_path, "lib/python00.zip"); ++ joinpath(zip_path, "lib64/python00.zip"); + bufsz = strlen(zip_path); /* Replace "00" with version */ + zip_path[bufsz - 6] = VERSION[0]; + zip_path[bufsz - 5] = VERSION[2]; +@@ -538,7 +538,7 @@ calculate_path(void) + fprintf(stderr, + "Could not find platform dependent libraries <exec_prefix>\n"); + strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); +- joinpath(exec_prefix, "lib/lib-dynload"); ++ joinpath(exec_prefix, "lib64/lib-dynload"); + } + /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ + +diff -up Python-2.7.1/Modules/Setup.dist.lib64 Python-2.7.1/Modules/Setup.dist +--- Python-2.7.1/Modules/Setup.dist.lib64 2010-12-23 15:51:19.400104130 -0500 ++++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:51:19.427063291 -0500 +@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm + # and the subdirectory of PORT where you built it. + DBLIBVER=4.7 + DBINC=/usr/include/db4 +-DBLIB=/usr/lib ++DBLIB=/usr/lib64 + _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + + # Historical Berkeley DB 1.85 +@@ -459,7 +459,7 @@ cPickle cPickle.c + # Andrew Kuchling's zlib module. + # This require zlib 1.1.3 (or later). + # See http://www.gzip.org/zlib/ +-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz ++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz + + # Interface to the Expat XML parser + # +diff -up Python-2.7.1/setup.py.lib64 Python-2.7.1/setup.py +--- Python-2.7.1/setup.py.lib64 2010-10-31 12:40:21.000000000 -0400 ++++ Python-2.7.1/setup.py 2010-12-23 15:51:19.428064129 -0500 +@@ -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/lib64') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + + # Add paths specified in the environment variables LDFLAGS and +@@ -654,11 +654,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/lib64/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/lib64/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + else: +@@ -692,8 +692,8 @@ class PyBuildExt(build_ext): + 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/' ++ ['/usr/local/ssl/lib64', ++ '/usr/contrib/ssl/lib64/' + ] ) + + if (ssl_incs is not None and diff --git a/python/python.nm b/python/python.nm index cfb8e03..2fe2004 100644 --- a/python/python.nm +++ b/python/python.nm @@ -47,6 +47,12 @@ build export CFLAGS += -D_GNU_SOURCE -fwrapv
prepare_cmds + # Apply patches for x86_64. + if [ "$(uname -m)" = "x86_64" ]; then + patch -Np1 -i %{DIR_SOURCE}/python-2.7.1-lib64.patch + patch -Np1 -i %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch + fi + sed -e "s/#*shared*/*shared*/g" -i Modules/Setup.dist
# Remove embedded copies of expat, zlib and libffi @@ -77,7 +83,7 @@ build
install_cmds # All *.py files don't need to be executeable... - find %{BUILDROOT}%{libdir}/python*/ -name "*.py" | xargs chmod a-x -v + find %{BUILDROOT}%{libdir}/python*/ -name "*.py" | xargs -r chmod a-x -v
# Create symlink for shared lib. ln -svf ../../libpython%{major_ver}.so %{BUILDROOT}%{libdir}/python%{major_ver}/config/
hooks/post-receive -- IPFire 3.x development tree