Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 564028 Details for
Bug 677398
dev-python/pypy-7.0.0 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
7.0.0_all_distutils_cxx.patch
7.0.0_all_distutils_cxx.patch (text/plain), 15.66 KB, created by
Sander Sweers
on 2019-02-07 00:14:14 UTC
(
hide
)
Description:
7.0.0_all_distutils_cxx.patch
Filename:
MIME Type:
Creator:
Sander Sweers
Created:
2019-02-07 00:14:14 UTC
Size:
15.66 KB
patch
obsolete
>diff -ur pypy3.5-v7.0.0-src.orig/lib_pypy/_sysconfigdata.py pypy3.5-v7.0.0-src/lib_pypy/_sysconfigdata.py >--- pypy3.5-v7.0.0-src.orig/lib_pypy/_sysconfigdata.py 2019-02-05 14:45:34.000000000 +0100 >+++ pypy3.5-v7.0.0-src/lib_pypy/_sysconfigdata.py 2019-02-06 22:41:28.520521482 +0100 >@@ -15,6 +15,7 @@ > 'CFLAGS': "-DNDEBUG -O2", > 'CCSHARED': "-fPIC", > 'LDSHARED': "cc -pthread -shared", >+ 'LDCXXSHARED': "c++ -pthread -shared", > 'EXT_SUFFIX': so_ext, > 'SHLIB_SUFFIX': ".so", > 'AR': "ar", >diff -ur pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/cygwinccompiler.py pypy3.5-v7.0.0-src/lib-python/3/distutils/cygwinccompiler.py >--- pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/cygwinccompiler.py 2019-02-05 14:45:34.000000000 +0100 >+++ pypy3.5-v7.0.0-src/lib-python/3/distutils/cygwinccompiler.py 2019-02-06 22:34:19.982644696 +0100 >@@ -125,8 +125,10 @@ > # dllwrap 2.10.90 is buggy > if self.ld_version >= "2.10.90": > self.linker_dll = "gcc" >+ self.linker_dll_cxx = "g++" > else: > self.linker_dll = "dllwrap" >+ self.linker_dll_cxx = "dllwrap" > > # ld_version >= "2.13" support -shared so use it instead of > # -mdll -static >@@ -140,9 +142,13 @@ > self.set_executables(compiler='gcc -mcygwin -O -Wall', > compiler_so='gcc -mcygwin -mdll -O -Wall', > compiler_cxx='g++ -mcygwin -O -Wall', >+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', > linker_exe='gcc -mcygwin', > linker_so=('%s -mcygwin %s' % >- (self.linker_dll, shared_option))) >+ (self.linker_dll, shared_option)), >+ linker_exe_cxx='g++ -mcygwin', >+ linker_so_cxx=('%s -mcygwin %s' % >+ (self.linker_dll_cxx, shared_option))) > > # cygwin and mingw32 need different sets of libraries > if self.gcc_version == "2.91.57": >@@ -166,8 +172,12 @@ > raise CompileError(msg) > else: # for other files use the C-compiler > try: >- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + >- extra_postargs) >+ if self.detect_language(src) == 'c++': >+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + >+ extra_postargs) >+ else: >+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + >+ extra_postargs) > except DistutilsExecError as msg: > raise CompileError(msg) > >@@ -302,9 +312,14 @@ > self.set_executables(compiler='gcc -O -Wall', > compiler_so='gcc -mdll -O -Wall', > compiler_cxx='g++ -O -Wall', >+ compiler_so_cxx='g++ -mdll -O -Wall', > linker_exe='gcc', > linker_so='%s %s %s' > % (self.linker_dll, shared_option, >+ entry_point), >+ linker_exe_cxx='g++', >+ linker_so_cxx='%s %s %s' >+ % (self.linker_dll_cxx, shared_option, > entry_point)) > # Maybe we should also append -mthreads, but then the finished > # dlls need another dll (mingwm10.dll see Mingw32 docs) >diff -ur pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/sysconfig_cpython.py pypy3.5-v7.0.0-src/lib-python/3/distutils/sysconfig_cpython.py >--- pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/sysconfig_cpython.py 2019-02-05 14:45:34.000000000 +0100 >+++ pypy3.5-v7.0.0-src/lib-python/3/distutils/sysconfig_cpython.py 2019-02-06 22:34:19.982644696 +0100 >@@ -173,9 +173,12 @@ > _osx_support.customize_compiler(_config_vars) > _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' > >- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ >- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', >- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') >+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ >+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', >+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') >+ >+ cflags = '' >+ cxxflags = '' > > if 'CC' in os.environ: > newcc = os.environ['CC'] >@@ -190,19 +193,27 @@ > cxx = os.environ['CXX'] > if 'LDSHARED' in os.environ: > ldshared = os.environ['LDSHARED'] >+ if 'LDCXXSHARED' in os.environ: >+ ldcxxshared = os.environ['LDCXXSHARED'] > if 'CPP' in os.environ: > cpp = os.environ['CPP'] > else: > cpp = cc + " -E" # not always > if 'LDFLAGS' in os.environ: > ldshared = ldshared + ' ' + os.environ['LDFLAGS'] >+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] > if 'CFLAGS' in os.environ: >- cflags = opt + ' ' + os.environ['CFLAGS'] >+ cflags = os.environ['CFLAGS'] > ldshared = ldshared + ' ' + os.environ['CFLAGS'] >+ if 'CXXFLAGS' in os.environ: >+ cxxflags = os.environ['CXXFLAGS'] >+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] > if 'CPPFLAGS' in os.environ: > cpp = cpp + ' ' + os.environ['CPPFLAGS'] > cflags = cflags + ' ' + os.environ['CPPFLAGS'] >+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] > ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] >+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] > if 'AR' in os.environ: > ar = os.environ['AR'] > if 'ARFLAGS' in os.environ: >@@ -211,13 +222,17 @@ > archiver = ar + ' ' + ar_flags > > cc_cmd = cc + ' ' + cflags >+ cxx_cmd = cxx + ' ' + cxxflags > compiler.set_executables( > preprocessor=cpp, > compiler=cc_cmd, > compiler_so=cc_cmd + ' ' + ccshared, >- compiler_cxx=cxx, >+ compiler_cxx=cxx_cmd, >+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, > linker_so=ldshared, > linker_exe=cc, >+ linker_so_cxx=ldcxxshared, >+ linker_exe_cxx=cxx, > archiver=archiver) > > compiler.shared_lib_extension = shlib_suffix >diff -ur pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/sysconfig_pypy.py pypy3.5-v7.0.0-src/lib-python/3/distutils/sysconfig_pypy.py >--- pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/sysconfig_pypy.py 2019-02-05 14:45:34.000000000 +0100 >+++ pypy3.5-v7.0.0-src/lib-python/3/distutils/sysconfig_pypy.py 2019-02-06 22:34:19.982644696 +0100 >@@ -145,36 +145,52 @@ > _osx_support.customize_compiler(_config_vars) > _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' > >- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ >- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', >- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') >+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ >+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', >+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') >+ >+ cflags = '' >+ cxxflags = '' > > if 'CC' in os.environ: > newcc = os.environ['CC'] >- if (sys.platform == 'darwin' >+ if (True > and 'LDSHARED' not in os.environ > and ldshared.startswith(cc)): > # On OS X, if CC is overridden, use that as the default > # command for LDSHARED as well >+ # Gentoo: s/OS X/every system/ > ldshared = newcc + ldshared[len(cc):] > cc = newcc > if 'CXX' in os.environ: >- cxx = os.environ['CXX'] >+ newcxx = os.environ['CXX'] >+ if ('LDCXXSHARED' not in os.environ >+ and ldcxxshared.startswith(cxx)): >+ ldcxxshared = newcxx + ldcxxshared[len(cxx):] >+ cxx = newcxx > if 'LDSHARED' in os.environ: > ldshared = os.environ['LDSHARED'] >+ if 'LDCXXSHARED' in os.environ: >+ ldcxxshared = os.environ['LDCXXSHARED'] > if 'CPP' in os.environ: > cpp = os.environ['CPP'] > else: > cpp = cc + " -E" # not always > if 'LDFLAGS' in os.environ: > ldshared = ldshared + ' ' + os.environ['LDFLAGS'] >+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] > if 'CFLAGS' in os.environ: >- cflags = opt + ' ' + os.environ['CFLAGS'] >+ cflags = os.environ['CFLAGS'] > ldshared = ldshared + ' ' + os.environ['CFLAGS'] >+ if 'CXXFLAGS' in os.environ: >+ cxxflags = os.environ['CXXFLAGS'] >+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] > if 'CPPFLAGS' in os.environ: > cpp = cpp + ' ' + os.environ['CPPFLAGS'] > cflags = cflags + ' ' + os.environ['CPPFLAGS'] >+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] > ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] >+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] > if 'AR' in os.environ: > ar = os.environ['AR'] > if 'ARFLAGS' in os.environ: >@@ -183,13 +199,17 @@ > archiver = ar + ' ' + ar_flags > > cc_cmd = cc + ' ' + cflags >+ cxx_cmd = cxx + ' ' + cxxflags > compiler.set_executables( > preprocessor=cpp, > compiler=cc_cmd, > compiler_so=cc_cmd + ' ' + ccshared, >- compiler_cxx=cxx, >+ compiler_cxx=cxx_cmd, >+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, > linker_so=ldshared, > linker_exe=cc, >+ linker_so_cxx=ldcxxshared, >+ linker_exe_cxx=cxx, > archiver=archiver) > > compiler.shared_lib_extension = shlib_suffix >Only in pypy3.5-v7.0.0-src/lib-python/3/distutils: .sysconfig_pypy.py.rej.swp >Only in pypy3.5-v7.0.0-src/lib-python/3/distutils: .sysconfig_pypy.py.swp >diff -ur pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/unixccompiler.py pypy3.5-v7.0.0-src/lib-python/3/distutils/unixccompiler.py >--- pypy3.5-v7.0.0-src.orig/lib-python/3/distutils/unixccompiler.py 2019-02-05 14:45:34.000000000 +0100 >+++ pypy3.5-v7.0.0-src/lib-python/3/distutils/unixccompiler.py 2019-02-06 22:34:19.983644697 +0100 >@@ -52,14 +52,17 @@ > # are pretty generic; they will probably have to be set by an outsider > # (eg. using information discovered by the sysconfig about building > # Python extensions). >- executables = {'preprocessor' : None, >- 'compiler' : ["cc"], >- 'compiler_so' : ["cc"], >- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus >- 'linker_so' : ["cc", "-shared"], >- 'linker_exe' : ["cc"], >- 'archiver' : ["ar", "-cr"], >- 'ranlib' : None, >+ executables = {'preprocessor' : None, >+ 'compiler' : ["cc"], >+ 'compiler_so' : ["cc"], >+ 'compiler_cxx' : ["c++"], >+ 'compiler_so_cxx' : ["c++"], >+ 'linker_so' : ["cc", "-shared"], >+ 'linker_exe' : ["cc"], >+ 'linker_so_cxx' : ["c++", "-shared"], >+ 'linker_exe_cxx' : ["c++"], >+ 'archiver' : ["ar", "-cr"], >+ 'ranlib' : None, > } > > if sys.platform[:6] == "darwin": >@@ -125,12 +128,19 @@ > > def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): > compiler_so = self.compiler_so >+ compiler_so_cxx = self.compiler_so_cxx > if sys.platform == 'darwin': > compiler_so = _osx_support.compiler_fixup(compiler_so, > cc_args + extra_postargs) >+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, >+ cc_args + extra_postargs) > try: >- self.spawn(compiler_so + cc_args + [src, '-o', obj] + >- extra_postargs) >+ if self.detect_language(src) == 'c++': >+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + >+ extra_postargs) >+ else: >+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + >+ extra_postargs) > except DistutilsExecError as msg: > raise CompileError(msg) > >@@ -188,22 +198,16 @@ > ld_args.extend(extra_postargs) > self.mkpath(os.path.dirname(output_filename)) > try: >- if target_desc == CCompiler.EXECUTABLE: >- linker = self.linker_exe[:] >+ if target_lang == "c++": >+ if target_desc == CCompiler.EXECUTABLE: >+ linker = self.linker_exe_cxx[:] >+ else: >+ linker = self.linker_so_cxx[:] > else: >- linker = self.linker_so[:] >- if target_lang == "c++" and self.compiler_cxx: >- # skip over environment variable settings if /usr/bin/env >- # is used to set up the linker's environment. >- # This is needed on OSX. Note: this assumes that the >- # normal and C++ compiler have the same environment >- # settings. >- i = 0 >- if os.path.basename(linker[0]) == "env": >- i = 1 >- while '=' in linker[i]: >- i += 1 >- linker[i] = self.compiler_cxx[i] >+ if target_desc == CCompiler.EXECUTABLE: >+ linker = self.linker_exe[:] >+ else: >+ linker = self.linker_so[:] > > if sys.platform == 'darwin': > linker = _osx_support.compiler_fixup(linker, ld_args) >diff -ur pypy3.5-v7.0.0-src.orig/lib-python/3/_osx_support.py pypy3.5-v7.0.0-src/lib-python/3/_osx_support.py >--- pypy3.5-v7.0.0-src.orig/lib-python/3/_osx_support.py 2019-02-05 14:45:34.000000000 +0100 >+++ pypy3.5-v7.0.0-src/lib-python/3/_osx_support.py 2019-02-06 22:34:19.982644696 +0100 >@@ -14,13 +14,13 @@ > # configuration variables that may contain universal build flags, > # like "-arch" or "-isdkroot", that may need customization for > # the user environment >-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', >- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', >- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', >- 'PY_CORE_CFLAGS') >+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', >+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', >+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', >+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') > > # configuration variables that may contain compiler calls >-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') >+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') > > # prefix added to original configuration variable names > _INITPRE = '_OSX_SUPPORT_INITIAL_'
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=564028">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 677398
: 564028 |
564128
|
564320
