Merge pull request #201 from vespa-engine/balder/select-toolset-versi…

…on-in-1-place Decide what toolset version to use.
vespa-engine · Nov 24, 2023 · c85188c · c85188c
2 parents d7b6c48 + 7f8c955
commit c85188c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/build-dependencies/.copr/Makefile b/build-dependencies/.copr/Makefile
@@ -4,7 +4,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 # Version
 MAJOR=1
 MINOR=2
-PATCH=4
+PATCH=5
 RELEASE=1
 PKGNAME=vespa-build-dependencies
 

diff --git a/build-dependencies/vespa-build-dependencies.spec.tmpl b/build-dependencies/vespa-build-dependencies.spec.tmpl
@@ -47,7 +47,7 @@ Requires: vespa-gtest = 1.13.0
 Requires: vespa-lz4-devel >= 1.9.4-2
 Requires: vespa-onnxruntime-devel = 1.16.3
 Requires: vespa-protobuf-devel = 3.21.12
-Requires: vespa-toolset-13-meta >= 13.1.1
+Requires: vespa-toolset-13-meta >= 13.1.2
 %endif
 
 %if 0%{?el9}
@@ -68,7 +68,7 @@ Requires: vespa-libzstd-devel >= 1.5.5-1
 Requires: vespa-lz4-devel >= 1.9.4-2
 Requires: vespa-onnxruntime-devel = 1.16.3
 Requires: vespa-protobuf-devel = 3.21.12
-Requires: vespa-toolset-13-meta >= 13.1.1
+Requires: vespa-toolset-13-meta >= 13.1.2
 %endif
 
 %if 0%{?fedora}

diff --git a/toolset-13/.copr/Makefile b/toolset-13/.copr/Makefile
@@ -4,7 +4,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 # Version
 MAJOR=13
 MINOR=1
-PATCH=1
+PATCH=2
 RELEASE=1
 PKGNAME=vespa-toolset
 

diff --git a/toolset-13/vespa-toolset.spec.tmpl b/toolset-13/vespa-toolset.spec.tmpl
@@ -58,6 +58,8 @@ cd ${incdir} || exit 1
 cat %{mydir}/patch.stl_vector.h.diff | patch -p0 -r -
 cd ${triple} || exit 1
 cat %{mydir}/patch.gthr-default.h.diff | patch -p0 -r -
+ln -sf $(dirname %{_devtoolset_enable}) /opt/rh/gcc-toolset
+printf '%s\n'  "# gcc"  "source /opt/rh/gcc-toolset/enable"  > /etc/profile.d/enable-gcc-toolset.sh
 %endif
 
 %changelog
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ TOP = $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) @@
     # Version
     MAJOR=1
     MINOR=2
-    PATCH=4
+    PATCH=5
     RELEASE=1
     PKGNAME=vespa-build-dependencies
@@ Expand Down @@