[patch] dev-python/pysvn/files/pysvn-1.9.4-respect_flags.patch

pysvn-1.9.4-respect_flags.patch (text/plain), 4.78 KB, created by Christoph Vogtländer on 2017-09-13 18:33:34 UTC

--- Source/setup_configure.py.orig	2016-12-09 12:06:55.733339195 +0100
+++ Source/setup_configure.py	2016-12-09 13:08:28.742538489 +0100
@@ -890,8 +890,8 @@
     def __init__( self, setup ):
         Compiler.__init__( self, setup )
 
-        self._addVar( 'CCC',            'g++' )
-        self._addVar( 'CC',             'gcc' )
+        self._addVar( 'CCC',            '$(CXX)' )
+        self._addVar( 'CC',             '$(CC)' )
 
     def getPythonExtensionFileExt( self ):
         return '.so'
@@ -1027,8 +1027,8 @@
         else:
             arch_options = ''
 
-        self._addVar( 'CCC',            'g++ %s' % (arch_options,) )
-        self._addVar( 'CC',             'gcc %s' % (arch_options,) )
+        self._addVar( 'CCC',            '$(CXX) %s' % (arch_options,) )
+        self._addVar( 'CC',             '$(CC) %s' % (arch_options,) )
 
         self._find_paths_pycxx_dir = [
                         '../Import/pycxx-%d.%d.%d' % min_pycxx_version,
@@ -1094,11 +1094,11 @@
 
     def setupUtilities( self ):
         self._addVar( 'CCCFLAGS',
-                                        '-g  '
+                                        '$(CXXFLAGS) '
                                         '-Wall -fPIC -fexceptions -frtti '
                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
                                         '-D%(DEBUG)s' )
-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
+        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
 
     def setupPySvn( self ):
         # Support building in a virtualenv.
@@ -1122,7 +1122,7 @@
         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
 
         py_cflags_list = [
-                    '-g',
+                    '$(CXXFLAGS) ',
                     '-Wall -fPIC',
                     '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
@@ -1156,21 +1156,19 @@
 
         if self.options.hasOption( '--link-python-framework-via-dynamic-lookup' ):
             # preferred link method on homebrew for pysvn
-            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
+            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
                                         '-framework System '
                                         '-framework CoreFoundation '
                                         '-framework Kerberos '
                                         '-framework Security '
-                                        '-undefined dynamic_lookup '
-                                        '%(LDLIBS)s' )
+                                        '-undefined dynamic_lookup ')
         else:
-            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
+            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
                                         '-framework System '
                                         '%(PYTHON_FRAMEWORK)s '
                                         '-framework CoreFoundation '
                                         '-framework Kerberos '
-                                        '-framework Security '
-                                        '%(LDLIBS)s' )
+                                        '-framework Security ')
 
 class UnixCompilerGCC(CompilerGCC):
     def __init__( self, setup ):
@@ -1233,11 +1231,11 @@
 
     def setupUtilities( self ):
         self._addVar( 'CCCFLAGS',
-                                        '-g  '
+                                        '$(CXXFLAGS) '
                                         '-Wall -fPIC -fexceptions -frtti '
                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
                                         '-D%(DEBUG)s' )
-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
+        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
 
     def setupPySvn( self ):
         self._pysvnModuleSetup()
@@ -1266,7 +1264,7 @@
 
         if self.options.hasOption( '--enable-debug' ):
             print( 'Info: Debug enabled' )
-            py_cflags_list.append( '-g' )
+            py_cflags_list.append( '$(CXXFLAGS)' )
 
         if self.options.hasOption( '--disable-deprecated-functions-warnings' ):
             print( 'Info: Disable deprecated functions warnings' )
@@ -1275,7 +1273,7 @@
         self._addVar( 'CCFLAGS',    ' '.join( py_cflags_list ) )
         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list+['-fexceptions -frtti'] ) )
         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )
-        self._addVar( 'LDSHARED',   '%(CCC)s -shared -g' )
+        self._addVar( 'LDSHARED',   '%(CCC)s -shared $(LDFLAGS)' )
 
 #--------------------------------------------------------------------------------
 class LinuxCompilerGCC(UnixCompilerGCC):