- fixup distutils/unixccompiler.py to remove standard library path from
rpath (patch 17) - delete DOS batch files
This commit is contained in:
parent
c2224367aa
commit
f5df1f8343
|
@ -0,0 +1,20 @@
|
||||||
|
diff -up Python-2.6.4/Lib/distutils/unixccompiler.py.distutils-rpath Python-2.6.4/Lib/distutils/unixccompiler.py
|
||||||
|
--- Python-2.6.4/Lib/distutils/unixccompiler.py.distutils-rpath 2009-09-09 04:34:06.000000000 -0400
|
||||||
|
+++ Python-2.6.4/Lib/distutils/unixccompiler.py 2010-03-15 21:33:25.000000000 -0400
|
||||||
|
@@ -142,6 +142,16 @@ class UnixCCompiler(CCompiler):
|
||||||
|
if sys.platform == "cygwin":
|
||||||
|
exe_extension = ".exe"
|
||||||
|
|
||||||
|
+ def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
|
||||||
|
+ """Remove standard library path from rpath"""
|
||||||
|
+ libraries, library_dirs, runtime_library_dirs = \
|
||||||
|
+ CCompiler._fix_lib_args(self, libraries, library_dirs,
|
||||||
|
+ runtime_library_dirs)
|
||||||
|
+ libdir = sysconfig.get_config_var('LIBDIR')
|
||||||
|
+ if runtime_library_dirs and (libdir in runtime_library_dirs):
|
||||||
|
+ runtime_library_dirs.remove(libdir)
|
||||||
|
+ return libraries, library_dirs, runtime_library_dirs
|
||||||
|
+
|
||||||
|
def preprocess(self, source,
|
||||||
|
output_file=None, macros=None, include_dirs=None,
|
||||||
|
extra_preargs=None, extra_postargs=None):
|
14
python.spec
14
python.spec
|
@ -52,7 +52,7 @@
|
||||||
Summary: An interpreted, interactive, object-oriented programming language
|
Summary: An interpreted, interactive, object-oriented programming language
|
||||||
Name: %{python}
|
Name: %{python}
|
||||||
Version: 2.6.4
|
Version: 2.6.4
|
||||||
Release: 22%{?dist}
|
Release: 23%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Provides: python-abi = %{pybasever}
|
Provides: python-abi = %{pybasever}
|
||||||
|
@ -231,6 +231,11 @@ Patch14: python-2.5.1-socketmodule-constants2.patch
|
||||||
# FIXME: is this for OSF, not Linux?
|
# FIXME: is this for OSF, not Linux?
|
||||||
Patch16: python-2.6-rpath.patch
|
Patch16: python-2.6-rpath.patch
|
||||||
|
|
||||||
|
# Fixup distutils/unixccompiler.py to remove standard library path from rpath:
|
||||||
|
# Adapted from Patch0 in ivazquez' python3000 specfile, removing usage of
|
||||||
|
# super() as it's an old-style class
|
||||||
|
Patch17: python-2.6.4-distutils-rpath.patch
|
||||||
|
|
||||||
# Fix distutils to follow the Fedora/RHEL/CentOS policies of having .pyo files
|
# Fix distutils to follow the Fedora/RHEL/CentOS policies of having .pyo files
|
||||||
Patch51: python-2.6-distutils_rpm.patch
|
Patch51: python-2.6-distutils_rpm.patch
|
||||||
|
|
||||||
|
@ -472,6 +477,7 @@ rm -r Modules/zlib || exit 1
|
||||||
%patch13 -p1 -b .socketmodule
|
%patch13 -p1 -b .socketmodule
|
||||||
%patch14 -p1 -b .socketmodule2
|
%patch14 -p1 -b .socketmodule2
|
||||||
%patch16 -p1 -b .rpath
|
%patch16 -p1 -b .rpath
|
||||||
|
%patch17 -p1 -b .distutils-rpath
|
||||||
|
|
||||||
%patch51 -p1 -b .brprpm
|
%patch51 -p1 -b .brprpm
|
||||||
%patch52 -p0 -b .valgrind
|
%patch52 -p0 -b .valgrind
|
||||||
|
@ -627,6 +633,7 @@ cp -ar Demo/* %{buildroot}%{demo_dir}
|
||||||
# Get rid of crap
|
# Get rid of crap
|
||||||
find %{buildroot}/ -name "*~"|xargs rm -f
|
find %{buildroot}/ -name "*~"|xargs rm -f
|
||||||
find %{buildroot}/ -name ".cvsignore"|xargs rm -f
|
find %{buildroot}/ -name ".cvsignore"|xargs rm -f
|
||||||
|
find %{buildroot}/ -name "*.bat"|xargs rm -f
|
||||||
find . -name "*~"|xargs rm -f
|
find . -name "*~"|xargs rm -f
|
||||||
find . -name ".cvsignore"|xargs rm -f
|
find . -name ".cvsignore"|xargs rm -f
|
||||||
#zero length
|
#zero length
|
||||||
|
@ -953,6 +960,11 @@ rm -fr %{buildroot}
|
||||||
# payload file would be unpackaged)
|
# payload file would be unpackaged)
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 16 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.4-23
|
||||||
|
- fixup distutils/unixccompiler.py to remove standard library path from
|
||||||
|
rpath (patch 17)
|
||||||
|
- delete DOS batch files
|
||||||
|
|
||||||
* Fri Mar 12 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.4-22
|
* Fri Mar 12 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.4-22
|
||||||
- add pyfuntop.stp; allow systemtap support to be disabled
|
- add pyfuntop.stp; allow systemtap support to be disabled
|
||||||
- remove trailing period from tkinter summary
|
- remove trailing period from tkinter summary
|
||||||
|
|
Loading…
Reference in New Issue