[Libreoffice-commits] core.git: 2 commits - autogen.sh distro-configs/Jenkins

[Libreoffice Gerrit user]

 autogen.sh                                   |    7 -------
 distro-configs/Jenkins/Linux_dev_master.conf |    2 ++
 distro-configs/Jenkins/linux_gcc_release_64  |    2 ++
 3 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit ab8454eb26f72f2d4081d90cb7e60e53e4a5590d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Nov 25 14:56:56 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Nov 25 17:25:34 2018 +0100

    Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux_dbg
    
    ...aka "Tinderbox on Master for Linux-DbgUtil",
    <https://ci.libreoffice.org/job/lo_tb_master_linux_dbg/>
    
    Change-Id: Icf99063e7aaf620cb13dd6ba869f98660f2de82a
    Reviewed-on: https://gerrit.libreoffice.org/63982
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf
index 4682382e66ce..6b3c7a7b0cc0 100644
--- a/distro-configs/Jenkins/Linux_dev_master.conf
+++ b/distro-configs/Jenkins/Linux_dev_master.conf
@@ -1,2 +1,4 @@
 --enable-dbgutil
 --enable-kde4
+CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
+CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
commit 5b0b08e49ad344ceb043e0cdd1e45b0aea3f559c
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Nov 25 15:52:47 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Nov 25 17:25:21 2018 +0100

    Better way of enabling Developer Toolset 7 for Jenkins' linux_gcc_release_64
    
    Enabling it in the relevant distro-configs/Jenkins/* file is more intuitive than
    enabling it in autogen.sh (and avoids issues like
    d057e61cb5aae15ea37ce9ac824647cd2060e331 "Restrict Developer Toolset to
    Config=linux_gcc_release_64"), and will also be used for other Jenkins jobs like
    <https://gerrit.libreoffice.org/#/c/63982/> "Enabling Developer Toolset 7 for
    Jenkins' lo_tb_master_linux_dbg".
    
    Change-Id: If633044a90c35a12a73d60335839af0a106aa20f
    Reviewed-on: https://gerrit.libreoffice.org/63989
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/autogen.sh b/autogen.sh
index 98dcb950886e..8c0bb0ade4ba 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -151,13 +151,6 @@ if (defined $ENV{LODE_HOME})
         $ENV{PATH}="$ENV{LODE_HOME}/opt/bin:$ENV{PATH}";
         print STDERR "add LODE_HOME/opt/bin in PATH\n";
     }
-    # For the Config=linux_gcc_release_64 Jenkins jobs that build on CentOS against Developer
-    # Toolset 7:
-    if ($ENV{Config} eq 'linux_gcc_release_64' && -d '/opt/rh/devtoolset-7/root/usr/bin')
-    {
-        $ENV{PATH}="/opt/rh/devtoolset-7/root/usr/bin:$ENV{PATH}";
-        print STDERR "added /opt/rh/devtoolset-7/root/usr/bin to PATH\n";
-    }
 }
 
 my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64
index 962c332840de..e30c34f941a4 100644
--- a/distro-configs/Jenkins/linux_gcc_release_64
+++ b/distro-configs/Jenkins/linux_gcc_release_64
@@ -1,2 +1,4 @@
 --disable-werror
+CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
+CXX=/opt/rh/devtoolset-7/root/usr/bin/g++