summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eltpatch.in2
-rw-r--r--patches/openmp/2.4.636
-rw-r--r--patches/openmp/2.4.736
3 files changed, 73 insertions, 1 deletions
diff --git a/eltpatch.in b/eltpatch.in
index 08ab587..f41563a 100644
--- a/eltpatch.in
+++ b/eltpatch.in
@@ -129,7 +129,7 @@ elibtoolize() {
local force="false"
local elt_patches="
install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm ppc64le
- g-debug specs fsanitize fuse-ld static-flags werror cxx-pthread color-record sed-quote
+ g-debug specs fsanitize fuse-ld static-flags werror cxx-pthread color-record sed-quote openmp
"
for x in "$@" ; do
diff --git a/patches/openmp/2.4.6 b/patches/openmp/2.4.6
new file mode 100644
index 0000000..dca6110
--- /dev/null
+++ b/patches/openmp/2.4.6
@@ -0,0 +1,36 @@
+https://lists.gnu.org/archive/html/libtool-patches/2024-03/msg00003.html
+https://bugs.gentoo.org/740310
+
+From cbe0f31e92142b624da92487ceed6b95e948f726 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 24 Mar 2024 08:24:30 +0000
+Subject: [PATCH] ltmain.in: Pass through -fopenmp=*
+
+Clang uses -fopenmp=* to allow choosing between libgomp and libomp.
+
+* build-aux/ltmain.in: Pass through -fopenmp=*.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5159,7 +5159,7 @@ func_mode_link ()
+ ;;
+
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
++ |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ func_append compiler_flags " $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+@@ -5693,7 +5693,7 @@ func_mode_link ()
+ found=false
+ case $deplib in
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
++ |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+--
+2.44.0
+
diff --git a/patches/openmp/2.4.7 b/patches/openmp/2.4.7
new file mode 100644
index 0000000..9aa171b
--- /dev/null
+++ b/patches/openmp/2.4.7
@@ -0,0 +1,36 @@
+https://lists.gnu.org/archive/html/libtool-patches/2024-03/msg00003.html
+https://bugs.gentoo.org/740310
+
+From c3e479801e530f86c37a5598e3ec8e910b957cd2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 24 Mar 2024 08:24:30 +0000
+Subject: [PATCH] ltmain.in: Pass through -fopenmp=*
+
+Clang uses -fopenmp=* to allow choosing between libgomp and libomp.
+
+* build-aux/ltmain.in: Pass through -fopenmp=*.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5198,7 +5198,7 @@ func_mode_link ()
+ continue
+ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
+- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
++ |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ func_append compiler_flags " $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+@@ -5755,7 +5755,7 @@ func_mode_link ()
+ found=false
+ case $deplib in
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+- |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
++ |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+--
+2.44.0
+