[SCM] supercollider/master: Disable parallel building

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0284afade8acfaa68a82f999d927746c8ce8853c
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Jul 19 23:37:45 2011 -0400

    Disable parallel building
    
    the chdir option cannot handle it

diff --git a/common/SConstruct b/common/SConstruct
index 76908d0..af08a0d 100644
--- a/common/SConstruct
+++ b/common/SConstruct
@@ -788,7 +788,7 @@ if PLATFORM == 'darwin':
 elif PLATFORM == 'linux':
     serverEnv.Append(
                 CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
-                LINKFLAGS = ['-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
+                LINKFLAGS = ['-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
 
 elif PLATFORM == 'freebsd':
     serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
@@ -1041,12 +1041,12 @@ if PLATFORM == 'darwin':
                 CPPPATH = ['#include/icu/unicode'])
 elif PLATFORM == 'linux':
     langEnv.Append(
-        LINKFLAGS = ['-Wl,-rpath,build', '-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
+        LINKFLAGS = ['-Wl,-rpath-link,build', '-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
 
 
 elif PLATFORM == 'freebsd':
     langEnv.Append(
-    LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
+    LINKFLAGS = '-Wl,-rpath-link,build -Wl,-rpath-link,' + FINAL_PREFIX + '/lib')
 
 if env['CURL']:
     langEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
@@ -1272,10 +1272,10 @@ if env['SCEL']:
                 'sed \'s, at PKG_DATA_DIR@,%s,g\' < $SOURCE > $TARGET' %
                 pkg_data_dir(FINAL_PREFIX))
     el_files = glob.glob('../editors/scel/el/*.el') + ['../editors/scel/el/sclang-vars.el']
-    elc_files = map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
-    elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp')
-    env.Command(elc_files, el_files,
-                'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"../editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
+    elc_files = [] #map(lambda f: os.path.splitext(f)[0] + '.elc', el_files)
+    elisp_dir = os.path.join(INSTALL_PREFIX, 'share', 'emacs', 'site-lisp', 'supercollider')
+    #env.Command(elc_files, el_files,
+    #            'emacs -batch --eval "(add-to-list \'load-path (expand-file-name \\"../editors/scel/el/\\"))" -f batch-byte-compile $SOURCES')
     env.Alias('install-elisp', env.Install(elisp_dir, el_files + elc_files))
     installEnv.Append(DATA = 'install-elisp')
 
diff --git a/debian/rules b/debian/rules
index b03d7c6..5148357 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,9 @@ DEB_BUILDDIR=common
 DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 export CDBS_NO_DOC_SYMLINKING:=1
 
-DEB_BUILD_PARALLEL = 1
+# Do not enable parallel building: scons cannot handle parallel
+# builds when the chdir option is used in any command
+# DEB_BUILD_PARALLEL = 1
 
 DEB_INSTALL_DOCS_supercollider             = "README LINUX" common/build/README
 DEB_INSTALL_DOCS_supercollider-server      = "README LINUX" common/build/README
diff --git a/editors/sced/SConstruct b/editors/sced/SConstruct
index 94d9957..472d34a 100644
--- a/editors/sced/SConstruct
+++ b/editors/sced/SConstruct
@@ -123,7 +123,7 @@ install_scedfiles = env.Alias('install-scedfiles', [
 update_mime = Builder(action =
 		'update-mime-database ' + os.path.join( share_dir(PREFIX), 'mime/packages' ) )
 
-env.BUILDERS = update_mime
+#env.BUILDERS = update_mime
 
 #install_doc = env.Alias('install-doc', env.Install(DOC_DIR, ['SCVim.scd']))
 #build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
diff --git a/editors/scvim/SConstruct b/editors/scvim/SConstruct
index dbecdbc..888809c 100644
--- a/editors/scvim/SConstruct
+++ b/editors/scvim/SConstruct
@@ -91,18 +91,18 @@ opts.Add(PathOption('SUPERCOLLIDER_HELP_DIR',
 	DEFAULT_SC_HELP, PathOption.PathIsDir))
 
 #create our enviroment, with our options and custom builders
-env = Environment(options = opts, BUILDERS = {'BuildHelp' : build_help})
+env = Environment(options = opts)
 
 
 #generate the help options
 Help(opts.GenerateHelpText(env))
 
 #XXX how do we test for vim?
-if not env.GetOption('clean'):
-	#test for the ruby
-	if os.system("ruby -e exit") != 0:
-		print "error: scvim depends on ruby and the ruby executable is not in your path"
-		Exit(1)
+#if not env.GetOption('clean'):
+#	#test for the ruby
+#	if os.system("ruby -e exit") != 0:
+#		print "error: scvim depends on ruby and the ruby executable is not in your path"
+#		Exit(1)
 
 #get our variables from the options
 PREFIX = env.get('PREFIX')
@@ -124,10 +124,10 @@ install_vimfiles = env.Alias('install-vimfiles', [
 	)
 
 install_doc = env.Alias('install-doc', env.Install(DOC_DIR, ['SCVim.scd']))
-build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
-	source = Dir(SUPERCOLLIDER_HELP_DIR)))
+#build_help = env.Alias('build-help', env.BuildHelp(target = Dir(DOC_DIR),
+#	source = Dir(SUPERCOLLIDER_HELP_DIR)))
 AlwaysBuild(Dir(DOC_DIR))
-Depends(build_help, install_doc)
+#Depends(build_help, install_doc)
 
 install_bin = env.Alias('install-bin',
 		install_dir(env, 'bin', bin_dir(PREFIX), ANY_FILE_RE, 1))
@@ -142,7 +142,7 @@ install_classes = env.Alias('install-classes', install_dir(
 env.Alias('install-all', [
 	install_bin,
 	install_vimfiles,
-	install_doc,
+#	install_doc,
 	install_rc,
 	install_classes])
 

-- 
supercollider packaging