| 1 |
commit: eb8edff66541a45fa425e4fb7223a4d2e47f4c93 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Apr 1 01:00:02 2022 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Apr 1 01:00:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eb8edff6 |
| 7 |
|
| 8 |
sys-cluster/temanejo: remove bashisms |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
.../temanejo/files/temanejo-1.3-bashisms.patch | 41 ++++++++++++++++++++++ |
| 13 |
sys-cluster/temanejo/temanejo-1.3.ebuild | 4 ++- |
| 14 |
2 files changed, 44 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/temanejo/files/temanejo-1.3-bashisms.patch b/sys-cluster/temanejo/files/temanejo-1.3-bashisms.patch |
| 17 |
new file mode 100644 |
| 18 |
index 000000000..095d16ced |
| 19 |
--- /dev/null |
| 20 |
+++ b/sys-cluster/temanejo/files/temanejo-1.3-bashisms.patch |
| 21 |
@@ -0,0 +1,41 @@ |
| 22 |
+--- a/Ayudame/configure.ac |
| 23 |
++++ b/Ayudame/configure.ac |
| 24 |
+@@ -22,8 +22,8 @@ |
| 25 |
+ # determine OS to set eg linker flags; yields variables host_os, host_vendor, and host_cpu |
| 26 |
+ AC_CANONICAL_HOST |
| 27 |
+ #echo "***************${host_os}" |
| 28 |
+-AM_CONDITIONAL([HAVE_LINUX], test "${host_os/linux}" != "$host_os") |
| 29 |
+-AM_CONDITIONAL([HAVE_APPLE], test "${host_os/darwin}" != "$host_os") |
| 30 |
++AM_CONDITIONAL([HAVE_LINUX], test "linux" = "$host_os") |
| 31 |
++AM_CONDITIONAL([HAVE_APPLE], test "darwin" = "$host_os") |
| 32 |
+ |
| 33 |
+ # from Kailai's version: |
| 34 |
+ #AC_CONFIG_MACRO_DIR([m4]) |
| 35 |
+--- a/Ayudame/m4/ompss_plugin.m4 |
| 36 |
++++ b/Ayudame/m4/ompss_plugin.m4 |
| 37 |
+@@ -32,7 +32,7 @@ |
| 38 |
+ # test if OmpSs headers usuable; this is a hack |
| 39 |
+ AC_LANG_PUSH([C++]) # switch to C++ |
| 40 |
+ CPPFLAGS_SAVE=$CPPFLAGS |
| 41 |
+- CPPFLAGS+=" -Ishould_not_be_here -I$with_ompss/include/nanox-dev -include"new_decl.hpp"" |
| 42 |
++ CPPFLAGS="${CPPFLAGS} -Ishould_not_be_here -I$with_ompss/include/nanox-dev -include"new_decl.hpp"" |
| 43 |
+ AC_CHECK_HEADER([plugin.hpp], [enable_ompss_plugin="yes"], [enable_ompss_plugin="no"]) # this does not seem to work with gxx |
| 44 |
+ CPPFLAGS=$CPPFLAGS_SAVE |
| 45 |
+ # check for c++11 compiler |
| 46 |
+@@ -41,13 +41,13 @@ |
| 47 |
+ ]) |
| 48 |
+ AM_CONDITIONAL(ENABLE_OMPSS_PLUGIN, test "$enable_ompss_plugin" != "no") |
| 49 |
+ |
| 50 |
+- AS_IF([test "$enable_ompss_plugin" == "yes"], [ |
| 51 |
++ AS_IF([test "$enable_ompss_plugin" = "yes"], [ |
| 52 |
+ # try to find APIs for getting number of threads/workers |
| 53 |
+ AC_LANG_PUSH([C++]) # switch to C++ |
| 54 |
+ CXXFLAGS_SAVE=$CXXFLAGS |
| 55 |
+ CPPFLAGS_SAVE=$CPPFLAGS |
| 56 |
+- CPPFLAGS+=" -Ishould_not_be_here2 -I$with_ompss/include/nanox-dev " |
| 57 |
+- CXXFLAGS+=" -std=c++03 " |
| 58 |
++ CPPFLAGS="${CPPFLAGS} -Ishould_not_be_here2 -I$with_ompss/include/nanox-dev " |
| 59 |
++ CXXFLAGS="${CXXFLAGS} -std=c++03 " |
| 60 |
+ # |
| 61 |
+ AC_COMPILE_IFELSE( |
| 62 |
+ [ AC_LANG_PROGRAM([#include <system.hpp>], |
| 63 |
|
| 64 |
diff --git a/sys-cluster/temanejo/temanejo-1.3.ebuild b/sys-cluster/temanejo/temanejo-1.3.ebuild |
| 65 |
index fb34f92ec..a1df16872 100644 |
| 66 |
--- a/sys-cluster/temanejo/temanejo-1.3.ebuild |
| 67 |
+++ b/sys-cluster/temanejo/temanejo-1.3.ebuild |
| 68 |
@@ -1,4 +1,4 @@ |
| 69 |
-# Copyright 1999-2021 Gentoo Authors |
| 70 |
+# Copyright 1999-2022 Gentoo Authors |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
EAPI=8 |
| 74 |
@@ -35,6 +35,8 @@ RDEPEND=" |
| 75 |
|
| 76 |
BDEPEND="doc? ( dev-texlive/texlive-latex )" |
| 77 |
|
| 78 |
+PATCHES=( "${FILESDIR}/${P}-bashisms.patch" ) |
| 79 |
+ |
| 80 |
src_prepare() { |
| 81 |
default |
| 82 |
eautoreconf |
Archives