diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/pysvn/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/pysvn/files')
-rw-r--r-- | dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch | 95 | ||||
-rw-r--r-- | dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch | 96 |
2 files changed, 191 insertions, 0 deletions
diff --git a/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch new file mode 100644 index 000000000000..18c7ea630dcf --- /dev/null +++ b/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch @@ -0,0 +1,95 @@ +diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py +--- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800 ++++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800 +@@ -848,8 +848,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' +@@ -975,8 +975,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' % pycxx_version, +@@ -1031,11 +1031,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', '$(CXX) $(LDFLAGS)' ) + + def setupPySvn( self ): + self._pysvnModuleSetup() +@@ -1047,7 +1047,7 @@ + self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() ) + + py_cflags_list = [ +- '-g', ++ '$(CXXFLAGS) ', + '-Wall -fPIC -fexceptions -frtti', + '-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', +@@ -1073,13 +1073,12 @@ + + self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) + self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) ) +- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g ' ++ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle ' + '-framework System ' + '%(PYTHON_FRAMEWORK)s ' + '-framework CoreFoundation ' + '-framework Kerberos ' +- '-framework Security ' +- '%(LDLIBS)s' ) ++ '-framework Security' ) + + class UnixCompilerGCC(CompilerGCC): + def __init__( self, setup ): +@@ -1139,11 +1138,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', '$(CXX) $(LDFLAGS)' ) + + def setupPySvn( self ): + self._pysvnModuleSetup() +@@ -1154,6 +1153,7 @@ + self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) ) + + py_cflags_list = [ ++ '$(CXXFLAGS)', + '-Wall -fPIC -fexceptions -frtti', + '-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', +@@ -1171,7 +1171,7 @@ + + self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) + self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) ) +- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' ) ++ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' ) + + #-------------------------------------------------------------------------------- + class LinuxCompilerGCC(UnixCompilerGCC): diff --git a/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch new file mode 100644 index 000000000000..7f1c35e59cb3 --- /dev/null +++ b/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch @@ -0,0 +1,96 @@ +diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py +--- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800 ++++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800 +@@ -848,8 +848,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' +@@ -975,8 +975,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' % pycxx_version, +@@ -1031,12 +1031,12 @@ + + def setupUtilities( self ): + self._addVar( 'CCCFLAGS', +- '-g ' ++ '$(CXXFLAGS) ' + '-no-long-double ' + '-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', '$(CXX) $(LDFLAGS)' ) + + def setupPySvn( self ): + self._pysvnModuleSetup() +@@ -1048,7 +1048,7 @@ + self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() ) + + py_cflags_list = [ +- '-g', ++ '$(CXXFLAGS) ', + '-no-long-double', + '-Wall -fPIC -fexceptions -frtti', + '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s', +@@ -1075,13 +1075,12 @@ + + self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) + self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) ) +- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g ' ++ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle ' + '-framework System ' + '%(PYTHON_FRAMEWORK)s ' + '-framework CoreFoundation ' + '-framework Kerberos ' +- '-framework Security ' +- '%(LDLIBS)s' ) ++ '-framework Security' ) + + class UnixCompilerGCC(CompilerGCC): + def __init__( self, setup ): +@@ -1141,11 +1140,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', '$(CXX) $(LDFLAGS)' ) + + def setupPySvn( self ): + self._pysvnModuleSetup() +@@ -1156,6 +1155,7 @@ + self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) ) + + py_cflags_list = [ ++ '$(CXXFLAGS)', + '-Wall -fPIC -fexceptions -frtti', + '-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', +@@ -1173,7 +1173,7 @@ + + self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) + self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) ) +- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' ) ++ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' ) + + #-------------------------------------------------------------------------------- + class LinuxCompilerGCC(UnixCompilerGCC): |