9757046077
* python3: Update to 3.6.1
The patches starting with 16 are new to fix the build.
Some no longer relevant patches were dropped, the rest is just refreshed.
* Bump pkgrel of all packages containing Python 3 bytecode/extensions.
The package list was generated using:
pkgfile.exe -R mingw64 -r "cpython.*\\.(py[cod]|dll)"
* lensfun: Add cmake to makedepends
* numpy: Don't hardcode the Python version
* blender: rebuild for new Python
* boost: Don't hardcode Python versions; rebuild
* pillow: Don't hardcode Python version; rebuild
* python-dateutil: Don't hardcode Python versions
* sip: Don't hardcode Python versions
* pyqt4: Don't hardcode Python versions; rebuild
* pyqt5: Don't hardcode Python versions; rebuild
* opencv: Update Python3 version in patch
68 lines
3.3 KiB
Diff
68 lines
3.3 KiB
Diff
--- Python-3.6.1/setup.py.orig 2017-06-13 18:50:07.965337000 +0200
|
|
+++ Python-3.6.1/setup.py 2017-06-13 18:51:04.486569800 +0200
|
|
@@ -419,7 +419,7 @@
|
|
# Debian/Ubuntu multiarch support.
|
|
# https://wiki.ubuntu.com/MultiarchSpec
|
|
cc = sysconfig.get_config_var('CC')
|
|
- tmpfile = os.path.join(self.build_temp, 'multiarch')
|
|
+ tmpfile = os.path.join(self.build_temp, 'multiarch').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
ret = os.system(
|
|
@@ -444,7 +444,7 @@
|
|
opt = ''
|
|
if cross_compiling:
|
|
opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
|
|
- tmpfile = os.path.join(self.build_temp, 'multiarch')
|
|
+ tmpfile = os.path.join(self.build_temp, 'multiarch').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
ret = os.system(
|
|
@@ -463,7 +463,7 @@
|
|
|
|
def add_gcc_paths(self):
|
|
gcc = sysconfig.get_config_var('CC')
|
|
- tmpfile = os.path.join(self.build_temp, 'gccpaths')
|
|
+ tmpfile = os.path.join(self.build_temp, 'gccpaths').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
|
|
@@ -747,7 +747,7 @@
|
|
readline_termcap_library = ""
|
|
curses_library = ""
|
|
# Cannot use os.popen here in py3k.
|
|
- tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib')
|
|
+ tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
# Determine if readline is already linked against curses or tinfo.
|
|
@@ -892,7 +892,7 @@
|
|
opensslv_h = find_file('openssl/opensslv.h', [],
|
|
inc_dirs + search_for_ssl_incs_in)
|
|
if opensslv_h:
|
|
- name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
|
|
+ name = os.path.join(opensslv_h[0], 'openssl/opensslv.h').replace('\\','/')
|
|
if host_platform == 'darwin' and is_macosx_sdk_path(name):
|
|
name = os.path.join(macosx_sdk_root(), name[1:])
|
|
try:
|
|
@@ -1795,16 +1795,16 @@
|
|
cflags = sysconfig.get_config_vars('CFLAGS')[0]
|
|
archs = re.findall(r'-arch\s+(\w+)', cflags)
|
|
|
|
- tmpfile = os.path.join(self.build_temp, 'tk.arch')
|
|
+ tmpfile = os.path.join(self.build_temp, 'tk.arch').replace('\\','/')
|
|
if not os.path.exists(self.build_temp):
|
|
os.makedirs(self.build_temp)
|
|
|
|
# Note: cannot use os.popen or subprocess here, that
|
|
# requires extensions that are not available here.
|
|
if is_macosx_sdk_path(F):
|
|
- os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(os.path.join(sysroot, F[1:]), tmpfile))
|
|
+ os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(os.path.join(sysroot, F[1:]).replace('\\','/'), tmpfile))
|
|
else:
|
|
- os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(F, tmpfile))
|
|
+ os.system("file %s/Tk.framework/Tk | grep 'for architecture' > %s"%(F.replace('\\','/'), tmpfile))
|
|
|
|
with open(tmpfile) as fp:
|
|
detected_archs = []
|