summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-01-18 13:27:49 +0100
committerRemi Collet <fedora@famillecollet.com>2017-01-18 13:27:49 +0100
commiteb70a1a28dd3f4c5eaa3531476455b810161c640 (patch)
tree8f84bd28f548df3e74c134d16a6e528d490238d1
parentff4476dfd19157db20c012104b3da169b0d5a7e7 (diff)
php 7.1.1-2: EL-7 rebuild with dts (again)
-rw-r--r--mock/el7x71.cfg8
-rw-r--r--mock/el7xscl71.cfg9
2 files changed, 8 insertions, 9 deletions
diff --git a/mock/el7x71.cfg b/mock/el7x71.cfg
index 3025737..a27876b 100644
--- a/mock/el7x71.cfg
+++ b/mock/el7x71.cfg
@@ -1,6 +1,6 @@
config_opts['root'] = 'el7x'
config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain'
config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
@@ -25,9 +25,9 @@ config_opts['macros']['%rhel']="7"
config_opts['macros']['%_with_ibase']="1"
config_opts['macros']['%_with_oci8']="1"
config_opts['macros']['%runselftest']="1"
-#config_opts['macros']['%dtsversion']="6"
-#config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-#config_opts['macros']['%dtsprefix']="devtoolset-6-"
+config_opts['macros']['%dtsversion']="6"
+config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
+config_opts['macros']['%dtsprefix']="devtoolset-6-"
config_opts['yum.conf'] = """
[main]
diff --git a/mock/el7xscl71.cfg b/mock/el7xscl71.cfg
index eec992a..40627e5 100644
--- a/mock/el7xscl71.cfg
+++ b/mock/el7xscl71.cfg
@@ -1,7 +1,6 @@
config_opts['root'] = 'scl71el7x'
config_opts['target_arch'] = 'x86_64'
-#config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build devtoolset-6-toolchain'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build devtoolset-6-toolchain'
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
config_opts['plugin_conf']['ccache_enable'] = True
@@ -28,9 +27,9 @@ config_opts['macros']['%_with_ibase']="1"
config_opts['macros']['%_with_oci8']="1"
config_opts['macros']['%runselftest']="1"
config_opts['macros']['%nophptag']="1"
-#config_opts['macros']['%dtsversion']="6"
-#config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
-#config_opts['macros']['%dtsprefix']="devtoolset-6-"
+config_opts['macros']['%dtsversion']="6"
+config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable"
+config_opts['macros']['%dtsprefix']="devtoolset-6-"
config_opts['yum.conf'] = """
[main]