ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/python.spec
(Generate patch)

Comparing COMP/CMSDIST/python.spec (file contents):
Revision 1.78 by eulisse, Wed Nov 2 14:15:50 2011 UTC vs.
Revision 1.96 by fwyzard, Fri Aug 31 14:31:11 2012 UTC

# Line 1 | Line 1
1 < ### RPM external python 2.6.4
1 > ### RPM external python 2.7.3
2   ## INITENV +PATH PATH %i/bin
3   ## INITENV +PATH LD_LIBRARY_PATH %i/lib
4   ## INITENV SETV PYTHON_LIB_SITE_PACKAGES lib/python%{python_major_version}/site-packages
5 + ## INITENV SETV PYTHONHASHSEED random
6   # OS X patches and build fudging stolen from fink
7   %{expand:%%define python_major_version %(echo %realversion | cut -d. -f1,2)}
8   %define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
9  
10 < Requires: expat bz2lib db4 gdbm
10 > Requires: expat bz2lib db4 gdbm openssl
11  
12   %if "%online" != "true"
13 < Requires: zlib openssl sqlite
13 > Requires: zlib sqlite
14   %endif
15  
16   # FIXME: readline, crypt
17   # FIXME: gmp, panel, tk/tcl, x11
18  
19   Source0: http://www.python.org/ftp/%n/%realversion/Python-%realversion.tgz
20 < Patch0: python-2.6.4-dont-detect-dbm
21 < Patch1: python-2.6.4-fix-macosx-relocation
20 > Patch1: python-fix-macosx-relocation
21 > Patch2: python-2.7.3-fix-pyport
22 > Patch3: python-2.7.3-ssl-fragment
23  
24   %prep
25   %setup -n Python-%realversion
# Line 26 | Line 28 | find . -type f | while read f; do
28      perl -p -i -e "s|#!.*/usr/local/bin/python|#!/usr/bin/env python|" $f
29    else :; fi
30   done
31 + %patch1 -p0
32  
33 < case %cmsplatf in
34 <  osx*)
35 <        sed 's|@PREFIX@|%i|g' < %_sourcedir/python-osx | patch -p1
36 <  ;;
37 < esac
35 < %patch0 -p1
36 < %patch1 -p1
33 > %ifos darwin
34 > %patch2 -p1
35 > %endif
36 >
37 > %patch3 -p1
38  
39   %build
40   # Python is awkward about passing other include or library directories
# Line 51 | Line 52 | esac
52   mkdir -p %i/include %i/lib %i/bin
53  
54   %if "%online" != "true"
55 < %define extradirs $ZLIB_ROOT $OPENSSL_ROOT $SQLITE_ROOT
55 > %define extradirs $ZLIB_ROOT $SQLITE_ROOT
56   %else
57   %define extradirs %{nil}
58   %endif
# Line 62 | Line 63 | dirs="$EXPAT_ROOT $BZ2LIB_ROOT $NCURSES_
63   # location of DB4, this was needed to avoid having it picked up from the system.
64   export DB4_ROOT
65  
66 + # Python's configure parses LDFLAGS and CPPFLAGS to look for aditional library and include directories
67   echo $dirs
68 + LDFLAGS=""
69 + CPPFLAGS=""
70   for d in $dirs; do
71 <  for f in $d/include/*; do
72 <    [ -e $f ] || continue
69 <    rm -f %i/include/$(basename $f)
70 <    ln -s $f %i/include
71 <  done
72 <  for f in $d/lib/*; do
73 <    [ -e $f ] || continue
74 <    rm -f %i/lib/$(basename $f)
75 <    ln -s $f %i/lib
76 <  done
71 >  LDFLAGS="$LDFLAGS -L $d/lib"
72 >  CPPFLAGS="$CPPFLAGS -I $d/include"
73   done
74 + export LDFLAGS
75 + export CPPFLAGS
76  
77   additionalConfigureOptions=""
78   case %cmsplatf in
# Line 83 | Line 81 | case %cmsplatf in
81      ;;
82   esac
83  
84 < ./configure --prefix=%i $additionalConfigureOptions --enable-shared \
85 <            --without-tkinter --disable-tkinter
84 > # Bugfix for dbm package. Use ndbm.h header and gdbm compatibility layer.
85 > sed -ibak "s/ndbm_libs = \[\]/ndbm_libs = ['gdbm', 'gdbm_compat']/" setup.py
86 >
87 > ./configure --prefix=%i $additionalConfigureOptions --enable-shared
88 >
89 > # Modify pyconfig.h to match macros from GLIBC features.h on Linux machines.
90 > # _POSIX_C_SOURCE and _XOPEN_SOURCE macros are not identical anymore
91 > # starting GLIBC 2.10.1. Python.h is not included before standard headers
92 > # in CMSSW and pyconfig.h is not smart enough to detect already defined
93 > # macros on Linux. The following problem does not exists on BSD machines as
94 > # cdefs.h does not define these macros.
95 > case %cmsplatf in
96 >  slc6*)
97 >    rm -f cms_configtest.cpp
98 >    cat <<CMS_EOF > cms_configtest.cpp
99 > #include <features.h>
100 >
101 > int main() {
102 >  return 0;
103 > }
104 > CMS_EOF
105 >
106 >    FEATURES=$(g++ -dM -E -DGNU_GCC=1 -D_GNU_SOURCE=1 -D_DARWIN_SOURCE=1 cms_configtest.cpp \
107 >      | grep -E '_POSIX_C_SOURCE |_XOPEN_SOURCE ')
108 >    rm -f cms_configtest.cpp a.out
109 >
110 >    POSIX_C_SOURCE=$(echo "${FEATURES}" | grep _POSIX_C_SOURCE | cut -d ' ' -f 3)
111 >    XOPEN_SOURCE=$(echo "${FEATURES}" | grep _XOPEN_SOURCE | cut -d ' ' -f 3)
112 >
113 >    sed -ibak "s/\(#define _POSIX_C_SOURCE \)\(.*\)/\1${POSIX_C_SOURCE}/g" pyconfig.h
114 >    sed -ibak "s/\(#define _XOPEN_SOURCE \)\(.*\)/\1${XOPEN_SOURCE}/g" pyconfig.h
115 >  ;;
116 > esac
117  
118   # The following is a kludge around the fact that the /usr/lib/libreadline.so
119   # symlink (for 32-bit lib) is missing on the 64bit machines
# Line 94 | Line 123 | case %cmsplatf in
123      ln -s /usr/lib/libreadline.so.4.3 %{i}/lib/libreadline.so
124    ;;
125   esac
126 +
127   make %makeprocesses
128  
129   %install
# Line 124 | Line 154 | case %cmsplatf in
154    ;;
155   esac
156  
157 < perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/idle \
158 <                    %{i}/bin/pydoc \
159 <                    %{i}/bin/python-config \
160 <                    %{i}/bin/2to3 \
161 <                    %{i}/bin/python2.6-config \
162 <                    %{i}/bin/smtpd.py \
133 <                    %{i}/lib/python2.6/bsddb/dbshelve.py \
134 <                    %{i}/lib/python2.6/test/test_bz2.py \
135 <                    %{i}/lib/python2.6/test/test_largefile.py \
136 <                    %{i}/lib/python2.6/test/test_optparse.py
157 > perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/idle \
158 >                     %{i}/bin/pydoc \
159 >                     %{i}/bin/python-config \
160 >                     %{i}/bin/2to3 \
161 >                     %{i}/bin/python2.7-config \
162 >                     %{i}/bin/smtpd.py
163  
164   find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
165   find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
# Line 149 | Line 175 | done
175   find %{i}/lib -type f -name "_tkinter.so" -exec rm {} \;
176  
177   # Remove documentation, examples and test files.
178 < %define drop_files %i/share %{i}/lib/python%{pythonv}/test
178 > %define drop_files { %i/share %{i}/lib/python%{pythonv}/test \
179 >                   %{i}/lib/python%{pythonv}/distutils/tests \
180 >                   %{i}/lib/python%{pythonv}/json/tests \
181 >                   %{i}/lib/python%{pythonv}/ctypes/test \
182 >                   %{i}/lib/python%{pythonv}/sqlite3/test \
183 >                   %{i}/lib/python%{pythonv}/bsddb/test \
184 >                   %{i}/lib/python%{pythonv}/email/test \
185 >                   %{i}/lib/python%{pythonv}/lib2to3/tests }
186  
187   # Remove .pyo files
188   find %i -name '*.pyo' -exec rm {} \;
# Line 167 | Line 200 | for tool in $(echo %{requiredtools} | se
200   done
201  
202   %post
203 < %{relocateConfig}lib/python2.6/config/Makefile
203 > %{relocateConfig}lib/python2.7/config/Makefile
204   %{relocateConfig}etc/profile.d/dependencies-setup.*sh

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines