create core package
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
Index: scons-2.1.0/engine/SCons/Tool/link.py
|
||||
===================================================================
|
||||
--- scons-2.1.0.orig/engine/SCons/Tool/link.py
|
||||
+++ scons-2.1.0/engine/SCons/Tool/link.py
|
||||
@@ -74,8 +74,8 @@ def generate(env):
|
||||
SCons.Tool.createProgBuilder(env)
|
||||
|
||||
env['SHLINK'] = '$LINK'
|
||||
- env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
|
||||
- env['SHLINKCOM'] = '$SHLINK -o $TARGET $SHLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
|
||||
+ env['SHLINKFLAGS'] = SCons.Util.CLVar('-shared')
|
||||
+ env['SHLINKCOM'] = '$SHLINK $SHLINKFLAGS $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS -o $TARGET'
|
||||
# don't set up the emitter, cause AppendUnique will generate a list
|
||||
# starting with None :-(
|
||||
env.Append(SHLIBEMITTER = [shlib_emitter])
|
||||
@@ -83,7 +83,7 @@ def generate(env):
|
||||
env['LINK'] = "$SMARTLINK"
|
||||
env['LINKFLAGS'] = SCons.Util.CLVar('')
|
||||
# __RPATH is only set to something ($_RPATH typically) on platforms that support it.
|
||||
- env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
|
||||
+ env['LINKCOM'] = '$LINK $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS -o $TARGET'
|
||||
env['LIBDIRPREFIX']='-L'
|
||||
env['LIBDIRSUFFIX']=''
|
||||
env['_LIBFLAGS']='${_stripixes(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}'
|
||||
@@ -106,7 +106,7 @@ def generate(env):
|
||||
env['LDMODULEPREFIX'] = '$SHLIBPREFIX'
|
||||
env['LDMODULESUFFIX'] = '$SHLIBSUFFIX'
|
||||
env['LDMODULEFLAGS'] = '$SHLINKFLAGS'
|
||||
- env['LDMODULECOM'] = '$LDMODULE -o $TARGET $LDMODULEFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
|
||||
+ env['LDMODULECOM'] = '$LDMODULE $LDMODULEFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS -o $TARGET'
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
Index: scons-1.3.0/engine/SCons/Tool/qt.py
|
||||
===================================================================
|
||||
--- scons-1.3.0.orig/engine/SCons/Tool/qt.py
|
||||
+++ scons-1.3.0/engine/SCons/Tool/qt.py
|
||||
@@ -139,7 +139,10 @@ class _Automoc:
|
||||
# c or fortran source
|
||||
continue
|
||||
#cpp_contents = comment.sub('', cpp.get_text_contents())
|
||||
- cpp_contents = cpp.get_text_contents()
|
||||
+ try:
|
||||
+ cpp_contents = cpp.get_text_contents()
|
||||
+ except AttributeError: # non-existant file
|
||||
+ cpp_contents = None
|
||||
h=None
|
||||
for h_ext in header_extensions:
|
||||
# try to find the header file in the corresponding source
|
||||
@@ -162,7 +165,7 @@ class _Automoc:
|
||||
#moc_cpp.target_scanner = SCons.Defaults.CScan
|
||||
if debug:
|
||||
print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp))
|
||||
- if cpp and q_object_search.search(cpp_contents):
|
||||
+ if cpp_contents and cpp and q_object_search.search(cpp_contents):
|
||||
# cpp file with Q_OBJECT macro found -> add moc
|
||||
# (to be included in cpp)
|
||||
moc = env.Moc(cpp)
|
||||
Reference in New Issue
Block a user