Skip to content

C
core
Kaydet (Commit) ac0b0669 authored tarafından Pedro Giffuni's avatar Pedro Giffuni
Dosyalara gözat
Seçenekler

i119384 - Python update to version 2.7.3 

This is the last 2.x version released: it includes many bug
fixes and also supports some backward compatible features
from the 3.1 series. More information is available here:
http://www.python.org/download/releases/2.7.3/

In order to reduce conflicts the patches were reorganized:
the FreeBSD patches are in their own patch now. The SSL
patches were split  in three parts: -md5, -ssl and a
Windows-specific  component that was merged along with
-security-flags into -pcbuild.

Patch by:	Hanya Runo and pfg@
üst c3f714be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 346 additions and 427 deletions
external_deps.lst
Dosyayı görüntüle @ ac0b0669
...@@ -201,13 +201,8 @@ if (ENABLE_MEDIAWIKI == YES) ...@@ -201,13 +201,8 @@ if (ENABLE_MEDIAWIKI == YES)
URL2 = $(SVN_TRUNK)$(MD5)-$(name) URL2 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES) if (SYSTEM_PYTHON != YES)
MD5 = bc702168a2af16869201dbe91e46ae48 MD5 = c57477edd6d18bd9eeca2f21add73919
name = LICENSE_Python-2.6.1 name = Python-2.7.3.tar.bz2
URL1 = $(SVN_TRUNK)$(MD5)-$(name)
if (SYSTEM_PYTHON != YES)
MD5 = e81c2f0953aa60f8062c05a4673f2be0
name = Python-2.6.1.tar.bz2
URL1 = $(SVN_TRUNK)$(MD5)-$(name) URL1 = $(SVN_TRUNK)$(MD5)-$(name)
if (GUI!=UNX || SYSTEM_ZLIB!=YES) if (GUI!=UNX || SYSTEM_ZLIB!=YES)
......
python/Python-2.6.1-mingw.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
This diff is collapsed.
python/Python-2.6.1-nohardlink.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
--- misc/Python-2.6.1/Makefile.pre.in 2011-03-08 18:23:37.230410480 +0100
+++ misc/build/Python-2.6.1/Makefile.pre.in 2011-03-08 18:22:57.935746999 +0100
@@ -414,7 +414,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
- $(LN) -f $(INSTSONAME) $@; \
+ $(LN) -fs $(INSTSONAME) $@; \
else\
$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
fi
@@ -767,7 +767,7 @@
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON))
-rm -f $(DESTDIR)$(BINDIR)/python-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
python/Python-2.6.1-sysbase.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
--- misc/Python-2.6.1/configure Thu Mar 17 13:00:41 2011
+++ misc/build/Python-2.6.1/configure Thu Mar 17 12:58:50 2011
@@ -2042,7 +2042,9 @@
if test -z "$MACHDEP"
then
ac_sys_system=`uname -s`
- if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+ if test -n "$OOO_SYSBASE_SYS_RELEASE"; then
+ ac_sys_release=$OOO_SYSBASE_SYS_RELEASE
+ elif test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
ac_sys_release=`uname -v`
else
python/Python-2.6.1.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
This diff is collapsed.
python/Python-disable-dbm.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
diff -uNrp misc/build/Python-2.6.1/setup.py misc/Python-2.6.1/setup.py
--- misc/build/Python-2.6.1/setup.py 2008-11-04 18:43:31.000000000 -0200
+++ misc/Python-2.6.1/setup.py 2011-11-20 18:50:21.871389472 -0300
@@ -1008,32 +1008,6 @@ class PyBuildExt(build_ext):
else:
missing.append('bsddb185')
- # The standard Unix dbm module:
- if platform not in ['cygwin']:
- if find_file("ndbm.h", inc_dirs, []) is not None:
- # Some systems have -lndbm, others don't
- if self.compiler.find_library_file(lib_dirs, 'ndbm'):
- ndbm_libs = ['ndbm']
- else:
- ndbm_libs = []
- exts.append( Extension('dbm', ['dbmmodule.c'],
- define_macros=[('HAVE_NDBM_H',None)],
- libraries = ndbm_libs ) )
- elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
- exts.append( Extension('dbm', ['dbmmodule.c'],
- define_macros=[('HAVE_GDBM_NDBM_H',None)],
- libraries = ['gdbm'] ) )
- elif db_incs is not None:
- exts.append( Extension('dbm', ['dbmmodule.c'],
- library_dirs=dblib_dir,
- runtime_library_dirs=dblib_dir,
- include_dirs=db_incs,
- define_macros=[('HAVE_BERKDB_H',None),
- ('DB_DBM_HSEARCH',None)],
- libraries=dblibs))
- else:
- missing.append('dbm')
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
python/Python-linux3.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
diff -uNrp misc/build/Python-2.6.1/configure misc/Python-2.6.1/configure
--- misc/build/Python-2.6.1/configure 2008-11-16 15:57:10.000000000 -0200
+++ misc/Python-2.6.1/configure 2011-11-19 21:10:49.259397448 -0300
@@ -2055,6 +2055,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
diff -uNrp misc/build/Python-2.6.1/configure.in misc/Python-2.6.1/configure.in
--- misc/build/Python-2.6.1/configure.in 2008-11-16 06:02:56.000000000 -0200
+++ misc/Python-2.6.1/configure.in 2011-11-19 21:10:55.388397133 -0300
@@ -229,6 +229,7 @@ then
MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in
+ linux*) MACHDEP="linux2";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
python/Python-parallel-make.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
--- misc/Python-2.6.1/Makefile.pre.in.fix-parallel-make 2010-07-22 15:01:39.567996932 -0400
+++ misc/build/Python-2.6.1/Makefile.pre.in 2010-07-22 15:47:02.437998509 -0400
@@ -207,6 +207,7 @@ SIGNAL_OBJS= @SIGNAL_OBJS@
##########################################################################
# Grammar
+GRAMMAR_STAMP= $(srcdir)/grammar-stamp
GRAMMAR_H= $(srcdir)/Include/graminit.h
GRAMMAR_C= $(srcdir)/Python/graminit.c
GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get
Modules/python.o: $(srcdir)/Modules/python.c
$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+# GNU "make" interprets rules with two dependents as two copies of the rule.
+#
+# In a parallel build this can lead to pgen being run twice, once for each of
+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler
+# reads a partially-overwritten copy of one of these files, leading to syntax
+# errors (or linker errors if the fragment happens to be syntactically valid C)
+#
+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html
+# for more information
+#
+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid
+# this:
+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP)
-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT)
-@$(INSTALL) -d Include
-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ touch $(GRAMMAR_STAMP)
$(PGEN): $(PGENOBJS)
$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
python/Python-ssl.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
--- misc/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:24:35.140625000 +0000
+++ misc/build/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:25:11.750000000 +0000
@@ -255,4 +255,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
--- misc/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000
+++ misc/build/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000
@@ -43,7 +43,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -57,7 +57,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -106,7 +106,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -120,7 +120,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -169,7 +169,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -183,7 +183,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -233,7 +233,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -247,7 +247,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -296,7 +296,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -310,7 +310,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -360,7 +360,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -374,7 +374,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
TargetMachine="17"
/>
<Tool
@@ -424,7 +424,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -438,7 +438,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
@@ -488,7 +488,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -502,7 +502,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
TargetMachine="17"
/>
<Tool
--- misc/Python-2.6.1/setup.py 2009-11-02 10:12:43.000000000 +0000
+++ misc/build/Python-2.6.1/setup.py 2009-11-02 10:18:19.000000000 +0000
@@ -612,7 +612,15 @@
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
+ UPDMINOR = os.environ.get('UPDMINOREXT')
+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
+ os.environ.get('INPATH') + '/' + \
+ 'inc'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/external/'
search_for_ssl_incs_in = [
+ ooosslinc,
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
@@ -624,8 +632,15 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
+ ooossllib = os.environ.get('SOLARVER') + '/' + \
+ os.environ.get('INPATH') + '/' + \
+ 'lib'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/'
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib',
+ [ooossllib,
+ '/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
--- misc/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:16:50.000000000 +0000
+++ misc/build/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:17:49.000000000 +0000
@@ -248,14 +248,14 @@
# 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.
python/Python-subversion-1-7.patch deleted 100644 → 0
Dosyayı görüntüle @ c3f714be
diff -uNrp misc/Python-2.6.1/configure misc/build/Python-2.6.1/configure
--- misc/Python-2.6.1/configure 2012-06-09 16:56:26.914428547 -0300
+++ misc/build/Python-2.6.1/configure 2012-06-09 16:58:30.606432414 -0300
@@ -4332,7 +4332,7 @@ if test $SVNVERSION = found
then
SVNVERSION="svnversion \$(srcdir)"
else
- SVNVERSION="echo exported"
+ SVNVERSION="echo Unversioned directory"
fi
case $MACHDEP in
diff -uNrp misc/Python-2.6.1/configure.in misc/build/Python-2.6.1/configure.in
--- misc/Python-2.6.1/configure.in 2012-06-09 16:56:26.917428547 -0300
+++ misc/build/Python-2.6.1/configure.in 2012-06-09 16:58:30.612432414 -0300
@@ -760,7 +760,7 @@ if test $SVNVERSION = found
then
SVNVERSION="svnversion \$(srcdir)"
else
- SVNVERSION="echo exported"
+ SVNVERSION="echo Unversioned directory"
fi
case $MACHDEP in
diff -uNrp misc/Python-2.6.1/Makefile.pre.in misc/build/Python-2.6.1/Makefile.pre.in
--- misc/Python-2.6.1/Makefile.pre.in 2012-06-09 16:56:26.907428547 -0300
+++ misc/build/Python-2.6.1/Makefile.pre.in 2012-06-09 16:58:30.587432414 -0300
@@ -498,7 +498,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(SIGNAL_OBJS) \
$(MODOBJS) \
$(srcdir)/Modules/getbuildinfo.c
- $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
+ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
diff -uNrp misc/Python-2.6.1/Misc/ACKS misc/build/Python-2.6.1/Misc/ACKS
--- misc/Python-2.6.1/Misc/ACKS 2008-11-03 13:18:30.000000000 -0200
+++ misc/build/Python-2.6.1/Misc/ACKS 2012-06-09 16:58:30.588432414 -0300
@@ -21,6 +21,7 @@ John Anderson
Erik Andersn
Oliver Andrich
Ross Andrus
+Arfrever Frehtes Taifersar Arahesis
Jason Asbahr
David Ascher
Chris AtLee
diff -uNrp misc/Python-2.6.1/Modules/getbuildinfo.c misc/build/Python-2.6.1/Modules/getbuildinfo.c
--- misc/Python-2.6.1/Modules/getbuildinfo.c 2007-06-07 20:53:49.000000000 -0300
+++ misc/build/Python-2.6.1/Modules/getbuildinfo.c 2012-06-09 16:58:30.593432414 -0300
@@ -48,5 +48,5 @@ _Py_svnversion(void)
static const char svnversion[] = SVNVERSION;
if (svnversion[0] != '$')
return svnversion; /* it was interpolated, or passed on command line */
- return "exported";
+ return "Unversioned directory";
}
diff -uNrp misc/Python-2.6.1/Python/sysmodule.c misc/build/Python-2.6.1/Python/sysmodule.c
--- misc/Python-2.6.1/Python/sysmodule.c 2008-07-10 14:13:55.000000000 -0300
+++ misc/build/Python-2.6.1/Python/sysmodule.c 2012-06-09 16:58:30.595432414 -0300
@@ -1161,7 +1161,7 @@ svnversion_init(void)
svnversion = _Py_svnversion();
- if (strcmp(svnversion, "exported") != 0)
+ if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
svn_revision = svnversion;
else if (istag) {
len = strlen(_patchlevel_revision);
python/makefile.mk
Dosyayı görüntüle @ ac0b0669
...@@ -42,17 +42,15 @@ all: ...@@ -42,17 +42,15 @@ all:
TARFILE_NAME=Python-$(PYVERSION) TARFILE_NAME=Python-$(PYVERSION)
TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 TARFILE_MD5=c57477edd6d18bd9eeca2f21add73919
PATCH_FILES=\ PATCH_FILES=\
Python-$(PYVERSION).patch \ python-$(PYVERSION).patch \
Python-parallel-make.patch \ python-freebsd.patch \
Python-ssl.patch \ python-md5.patch \
Python-2.6.1-sysbase.patch \ python-ssl.patch \
Python-2.6.1-nohardlink.patch \ python-$(PYVERSION)-sysbase.patch \
Python-2.6.1-security-flags.patch \ python-$(PYVERSION)-nohardlink.patch \
Python-disable-dbm.patch \ python-$(PYVERSION)-pcbuild.patch
Python-linux3.patch \
Python-subversion-1-7.patch
CONFIGURE_DIR= CONFIGURE_DIR=
...@@ -84,7 +82,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && ...@@ -84,7 +82,7 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install &&
# WINDOWS # WINDOWS
# ---------------------------------- # ----------------------------------
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
PATCH_FILES=Python-$(PYVERSION)-mingw.patch PATCH_FILES=python-$(PYVERSION)-mingw.patch
BUILD_DIR= BUILD_DIR=
MYCWD=$(shell cygpath -m $(shell @pwd))/$(INPATH)/misc/build MYCWD=$(shell cygpath -m $(shell @pwd))/$(INPATH)/misc/build
python_CFLAGS=-mno-cygwin -mthreads python_CFLAGS=-mno-cygwin -mthreads
...@@ -112,6 +110,9 @@ BUILD_ACTION=$(ENV_BUILD) make && make install ...@@ -112,6 +110,9 @@ BUILD_ACTION=$(ENV_BUILD) make && make install
BUILD_DIR=PCbuild BUILD_DIR=PCbuild
PATCH_FILES=Python-$(PYVERSION)-vc.patch \
Python-$(PYVERSION)-ssl-vc.patch
# Build python executable and then runs a minimal script. Running the minimal script # Build python executable and then runs a minimal script. Running the minimal script
# ensures that certain *.pyc files are generated which would otherwise be created on # ensures that certain *.pyc files are generated which would otherwise be created on
# solver during registration in insetoo_native # solver during registration in insetoo_native
......
python/prj/d.lst
Dosyayı görüntüle @ ac0b0669
This diff is collapsed.
python/python-2.7.3-mingw.patch 0 → 100644
Dosyayı görüntüle @ ac0b0669
This diff is collapsed.
python/python-2.7.3-nohardlink.patch 0 → 100644
Dosyayı görüntüle @ ac0b0669
--- misc/Python-2.7.3/Makefile.pre.in 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Makefile.pre.in 2012-07-22 14:54:26.000000000 -0500
@@ -427,7 +427,7 @@
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
- $(LN) -f $(INSTSONAME) $@; \
+ $(LN) -fs $(INSTSONAME) $@; \
else \
$(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
fi
python/python-2.7.3-sysbase.patch 0 → 100644
Dosyayı görüntüle @ ac0b0669
--- misc/Python-2.7.3/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.3/configure 2012-07-22 15:01:20.000000000 -0500
@@ -2982,7 +2982,9 @@
if test -z "$MACHDEP"
then
ac_sys_system=`uname -s`
- if test "$ac_sys_system" = "AIX" \
+ if test -n "$OOO_SYSBASE_SYS_RELEASE"; then
+ ac_sys_release=$OOO_SYSBASE_SYS_RELEASE
+ elif test "$ac_sys_system" = "AIX" \
-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
ac_sys_release=`uname -v`
else
python/python-2.7.3.patch 0 → 100644
Dosyayı görüntüle @ ac0b0669
diff -ru misc/Python-2.7.3/Include/pyport.h misc/build/Python-2.7.3/Include/pyport.h
--- misc/Python-2.7.3/Include/pyport.h 2012-04-09 18:07:29.000000000 -0500
+++ misc/build/Python-2.7.3/Include/pyport.h 2012-07-24 18:19:52.000000000 -0500
@@ -603,11 +603,6 @@
in platform-specific #ifdefs.
**************************************************************************/
-#ifdef SOLARIS
-/* Unchecked */
-extern int gethostname(char *, int);
-#endif
-
#ifdef __BEOS__
/* Unchecked */
/* It's in the libs, but not the headers... - [cjh] */
Only in misc/build/Python-2.7.3/Include: pyport.h.orig
diff -ru misc/Python-2.7.3/PCbuild/pcbuild.sln misc/build/Python-2.7.3/PCbuild/pcbuild.sln
--- misc/Python-2.7.3/PCbuild/pcbuild.sln 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.3/PCbuild/pcbuild.sln 2012-07-24 22:31:19.000000000 -0500
@@ -38,17 +38,17 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
- ProjectSection(ProjectDependencies) = postProject
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
-EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
+# ProjectSection(ProjectDependencies) = postProject
+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+# EndProjectSection
+#EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
+# ProjectSection(ProjectDependencies) = postProject
+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+# EndProjectSection
+#EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
@@ -87,16 +87,16 @@
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
-EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
+# ProjectSection(ProjectDependencies) = postProject
+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+# EndProjectSection
+#EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
+# ProjectSection(ProjectDependencies) = postProject
+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+# EndProjectSection
+#EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
@@ -114,17 +114,17 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
- ProjectSection(ProjectDependencies) = postProject
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
- ProjectSection(ProjectDependencies) = postProject
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
- EndProjectSection
-EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
+# ProjectSection(ProjectDependencies) = postProject
+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+# EndProjectSection
+#EndProject
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
+# ProjectSection(ProjectDependencies) = postProject
+# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
+# EndProjectSection
+#EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
Only in misc/build/Python-2.7.3/PCbuild: pcbuild.sln.orig
python/python-freebsd.patch 0 → 100644
Dosyayı görüntüle @ ac0b0669
Only in misc/build/Python-2.7.3/Lib: plat-freebsd9
diff -ru misc/Python-2.7.3/Lib/test/test_threading.py misc/build/Python-2.7.3/Lib/test/test_threading.py
--- misc/Python-2.7.3/Lib/test/test_threading.py 2012-04-09 18:07:32.000000000 -0500
+++ misc/build/Python-2.7.3/Lib/test/test_threading.py 2012-07-24 22:39:03.000000000 -0500
@@ -421,7 +421,7 @@
# #12316 and #11870), and fork() from a worker thread is known to trigger
# problems with some operating systems (issue #3863): skip problematic tests
# on platforms known to behave badly.
- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'netbsd5',
'os2emx')
def _run_and_join(self, script):
diff -ru misc/Python-2.7.3/Modules/_ctypes/libffi/configure misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure
--- misc/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/_ctypes/libffi/configure 2012-07-24 22:39:03.000000000 -0500
@@ -6289,7 +6289,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
diff -ru misc/Python-2.7.3/Python/thread_pthread.h misc/build/Python-2.7.3/Python/thread_pthread.h
--- misc/Python-2.7.3/Python/thread_pthread.h 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.3/Python/thread_pthread.h 2012-07-24 22:39:03.000000000 -0500
@@ -56,7 +56,6 @@
in default setting. So the process scope is preferred to get
enough number of threads to work. */
#ifdef __FreeBSD__
-#include <osreldate.h>
#if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
#undef PTHREAD_SYSTEM_SCHED_SUPPORTED
#endif
@@ -161,6 +160,9 @@
{
pthread_t th;
int status;
+#ifdef __FreeBSD__
+ sigset_t set, oset;
+#endif
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_t attrs;
#endif
@@ -172,6 +174,9 @@
if (!initialized)
PyThread_init_thread();
+#ifdef __FreeBSD__
+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
+#endif
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
if (pthread_attr_init(&attrs) != 0)
return -1;
@@ -189,7 +194,10 @@
#if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
#endif
-
+#ifdef __FreeBSD__
+ sigfillset(&set);
+ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset);
+#endif
status = pthread_create(&th,
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
&attrs,
@@ -200,6 +208,9 @@
(void *)arg
);
+#ifdef __FreeBSD__
+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL);
+#endif
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
diff -ru misc/Python-2.7.3/configure misc/build/Python-2.7.3/configure
--- misc/Python-2.7.3/configure 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.3/configure 2012-07-24 22:39:03.000000000 -0500
@@ -4916,7 +4916,7 @@
;;
SunOS*)
LDLIBRARY='libpython$(VERSION).so'
- BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
+ BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
@@ -4924,11 +4924,6 @@
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- case $ac_sys_system in
- FreeBSD*)
- SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
- ;;
- esac
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
hp*|HP*)
diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
--- misc/Python-2.7.3/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.3/setup.py 2012-07-24 22:39:03.000000000 -0500
@@ -1432,7 +1432,7 @@
macros = dict()
libraries = []
- elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9'):
# FreeBSD's P1003.1b semaphore support is very experimental
# and has many known problems. (as of June 2008)
macros = dict()
@@ -1484,7 +1484,7 @@
missing.append('linuxaudiodev')
if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
- 'freebsd7', 'freebsd8')
+ 'freebsd7', 'freebsd8', 'freebsd9')
or platform.startswith("gnukfreebsd")):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
else:
python/python-md5.patch 0 → 100644
Dosyayı görüntüle @ ac0b0669
diff -ru misc/Python-2.7.3/Modules/Setup.dist misc/build/Python-2.7.3/Modules/Setup.dist
--- misc/Python-2.7.3/Modules/Setup.dist 2012-04-09 18:07:33.000000000 -0500
+++ misc/build/Python-2.7.3/Modules/Setup.dist 2012-07-24 17:08:56.000000000 -0500
@@ -248,14 +248,14 @@
# 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.
python/python-ssl.patch 0 → 100644
Dosyayı görüntüle @ ac0b0669
diff -ru misc/Python-2.7.3/PCbuild/build_ssl.py misc/build/Python-2.7.3/PCbuild/build_ssl.py
--- misc/Python-2.7.3/PCbuild/build_ssl.py 2012-04-09 18:07:35.000000000 -0500
+++ misc/build/Python-2.7.3/PCbuild/build_ssl.py 2012-07-25 14:37:37.000000000 -0500
@@ -253,4 +253,4 @@
sys.exit(rc)
if __name__=='__main__':
- main()
+ sys.exit(0)
diff -ru misc/Python-2.7.3/setup.py misc/build/Python-2.7.3/setup.py
--- misc/Python-2.7.3/setup.py 2012-04-09 18:07:36.000000000 -0500
+++ misc/build/Python-2.7.3/setup.py 2012-07-25 14:37:37.000000000 -0500
@@ -702,7 +702,15 @@
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
+ UPDMINOR = os.environ.get('UPDMINOREXT')
+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
+ os.environ.get('INPATH') + '/' + \
+ 'inc'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/external/'
search_for_ssl_incs_in = [
+ ooosslinc,
'/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
@@ -714,8 +722,15 @@
['/usr/kerberos/include'])
if krb5_h:
ssl_incs += krb5_h
+ ooossllib = os.environ.get('SOLARVER') + '/' + \
+ os.environ.get('INPATH') + '/' + \
+ 'lib'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/'
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib',
+ [ooossllib,
+ '/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
python/pyversion.mk
Dosyayı görüntüle @ ac0b0669
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
# when you want to change the python version, you must update the d.lst # when you want to change the python version, you must update the d.lst
# in the python project accordingly !!! # in the python project accordingly !!!
PYMAJOR=2 PYMAJOR=2
PYMINOR=6 PYMINOR=7
PYMICRO=1 PYMICRO=3
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO) PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
.IF "$(GUI)" == "UNX" .IF "$(GUI)" == "UNX"
......
pyuno/zipcore/makefile.mk
Dosyayı görüntüle @ ac0b0669
...@@ -54,9 +54,14 @@ FINDLIBFILES_TMP:=$(subst,/,$/ \ ...@@ -54,9 +54,14 @@ FINDLIBFILES_TMP:=$(subst,/,$/ \
$(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed)) $(shell @$(FIND) $(SOLARLIBDIR)$/python -type f| $(GREP) -v "\.pyc" |$(GREP) -v "\.py~" |$(GREP) -v .orig | $(GREP) -v _failed))
FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP)) FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP))
FINDINCFILES_TMP:=$(subst,/,$/ \
$(shell @$(FIND) $(SOLARINCDIR)$/python -type f| $(GREP) -v "\.h~" | $(GREP) -v _failed))
FINDINCFILES=$(subst,$(SOLARINCDIR)$/python, $(FINDINCFILES_TMP))
FILES=\ FILES=\
$(PYTHONBINARY) \ $(PYTHONBINARY) \
$(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) \
$(foreach,i,$(FINDINCFILES) $(DESTROOT)$/include$/python$(PYMAJOR).$(PYMINOR)$(i))
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"
APP1TARGET = python APP1TARGET = python
...@@ -101,6 +106,11 @@ $(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/% ...@@ -101,6 +106,11 @@ $(DESTROOT)$/lib$/% : $(SOLARLIBDIR)$/python$/%
-rm -f $@ -rm -f $@
cat $< > $@ cat $< > $@
$(DESTROOT)$/include$/python$(PYMAJOR).$(PYMINOR)%: $(SOLARINCDIR)$/python$/%
-$(MKDIRHIER) $(@:d)
-rm -f $@
cat $< > $@
.IF "$(GUI)"== "UNX" .IF "$(GUI)"== "UNX"
$(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST) $(BIN)$/python$(EXECPOST).bin : $(SOLARBINDIR)$/python$(EXECPOST)
-$(MKDIRHIER) $(@:d) -$(MKDIRHIER) $(@:d)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment