X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=6933cdd87d30add13d48ae1d4ebf77144ff9ecfe;hb=f703fc2473eb04da5fcbf6f3e06ccb6489a5ab5a;hp=448235015292dbb5c1632c2ce8992b73aaf15a13;hpb=9b74a2f5f92fd6244177cb041d7019f76df697e9;p=libsub.git

diff --git a/cscript b/cscript
index 4482350..6933cdd 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,30 @@
+#
+#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libsub.
+#
+#    libsub is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libsub is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libsub.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 
-def dependencies(target):
-    return (('asdcplib-cth', 'f3b0fb8'), ('libcxml', 'a8d8cba'), ('libdcp', '182f327'))
+option_defaults = { 'force-cpp11': False }
+
+def dependencies(target, options):
+    libdcp =  ('libdcp', 'f3e6907', { 'force-cpp11': options['force-cpp11'] })
+    libcxml = ('libcxml', 'c333199', { 'force-cpp11': options['force-cpp11'] })
+    return (('asdcplib', 'carl'), libcxml, libdcp)
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,20 +32,25 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-            if target.version == '7':
-            	# Centos 7 ships with glibmm 2.50.0 which requires C++11
-                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
-                # I worry that this will cause ABI problems but I don't have
-                # a better solution.
-                cmd += ' --force-cpp11'
-        if target.distro == 'mageia' and target.version == '6':
-            # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
-            cmd += ' --force-cpp11'
     if target.debug:
         cmd += ' --enable-debug'
     if target.platform == 'windows':
         cmd += ' --target-windows --disable-tests'
 
+    # Centos 7 ships with glibmm 2.50.0 which requires C++11
+    # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
+    # I worry that this will cause ABI problems but I don't have
+    # a better solution.  Mageia 6 pulls the same stunt except it's
+    # libxml++ that requires C++11
+    force_cpp11 = False
+    if target.platform == 'linux':
+        if target.distro == 'centos' and target.version == '7':
+            force_cpp11 = True
+        if target.distro == 'mageia' and target.version == '6':
+            force_cpp11 = True
+    if force_cpp11 or options['force-cpp11']:
+        cmd += ' --force-cpp11'
+
     target.command(cmd)
     target.command('./waf build install')