[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/the-omega-project/, sci-mathematics/the-omega-project/files/
commit: 1dc1bcfb7372e74b502952d87c2de827c243704c
Author: Alessandro Barbieri gmail com>
AuthorDate: Sun Sep 5 03:37:43 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Sun Sep 5 03:37:43 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1dc1bcfb
sci-mathematics/the-omega-project: respect LDFLAGS, build PIE
Closes: https://bugs.gentoo.org/807929
Signed-off-by: Alessandro Barbieri gmail.com>
.../files/the-omega-project-respect-flags.patch | 21 -
.../the-omega-project-2.1_p20131119.ebuild | 2 +-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git
a/sci-mathematics/the-omega-project/files/the-omega-project-respect-flags.patch
b/sci-mathematics/the-omega-project/files/the-omega-project-respect-flags.patch
index cf001299d..298297680 100644
---
a/sci-mathematics/the-omega-project/files/the-omega-project-respect-flags.patch
+++
b/sci-mathematics/the-omega-project/files/the-omega-project-respect-flags.patch
@@ -32,7 +32,7 @@
-LIB_DESTDIR=$(DESTDIR)/lib
-BIN_DESTDIR=$(DESTDIR)/bin
+INCL_DESTDIR=$(DESTDIR)/usr/include/omega
-+LIB_DESTDIR=$(DESTDIR)/usr/lib
++LIB_DESTDIR=$(DESTDIR)/usr/lib64
+BIN_DESTDIR=$(DESTDIR)/usr/bin
# This is only used if you modify the grammar file. Use bison if you have it.
@@ -43,3 +43,22 @@
MAKEDEPEND=makedepend
-AR=ar
-
+--- a/Makefile.rules
b/Makefile.rules
+@@ -32,14 +32,14 @@
+ LIBS=$(REQ_LIBS) $(STD_LIBS) $(TARGET_LIBS) $(OS_LIBS) $(EXTRA_LIBS)
+
+ CFLAGS=$(STD_CFLAGS) $(OPTIMIZATION_CFLAGS) $(COMPILER_CFLAGS) $(OS_CFLAGS)
$(TARGET_CFLAGS) $(INCL_PATH)
+-LDFLAGS=$(STD_LDFLAGS) $(OPTIMIZATION_CFLAGS) $(TARGET_LDFLAGS) $(LIB_PATH)
$(LIBS)
++LDFLAGS+=$(STD_LDFLAGS) $(OPTIMIZATION_CFLAGS) $(TARGET_LDFLAGS) $(LIB_PATH)
$(LIBS)
+
+ ALLDIRS=omega_lib omega_calc petit uniform code_gen basic parse_lib
+ #ALLDIRS=omega_lib omega_calc petit code_gen basic
+
+ # Executable target; can have only one per directory
+ .executable: required_libs $(OBJS)
+- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(TARGET)
++ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -fPIE -o $(TARGET)
+ touch .executable
+
+
diff --git
a/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
b/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
index 494b4f982..520f7c0ef 100644
--- a/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
+++ b/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
@@ -45,7 +45,7 @@ src_prepare() {
use debug || append-cxxflags '-DNDEBUG'
use gui || append-cxxflags '-DBATCH_ONLY_PETIT'
tc-export CXX RANLIB
- sed -e "s|/usr/lib|/usr/$(get_libdir)|g" -i Makefile.config || die
+ sed -e "s|/usr/lib64|/usr/$(get_libdir)|g" -i Makefile.config || die
}
src_compile() {
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/the-omega-project/
commit: 72b0cb639c24916ff2cb509f98fd28d01effc3c6
Author: Alessandro Barbieri gmail com>
AuthorDate: Sat Aug 7 23:43:52 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Sat Aug 7 23:43:52 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=72b0cb63
sci-mathematics/the-omega-project: reverse gui logic
Signed-off-by: Alessandro Barbieri gmail.com>
.../the-omega-project/the-omega-project-2.1_p20131119.ebuild| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
b/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
index ee5e18912..494b4f982 100644
--- a/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
+++ b/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
default
append-cxxflags '-DSTILL_CHECK_MULT=1'
use debug || append-cxxflags '-DNDEBUG'
- use gui && append-cxxflags '-DBATCH_ONLY_PETIT'
+ use gui || append-cxxflags '-DBATCH_ONLY_PETIT'
tc-export CXX RANLIB
sed -e "s|/usr/lib|/usr/$(get_libdir)|g" -i Makefile.config || die
}
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/the-omega-project/files/, sci-mathematics/the-omega-project/
commit: a2783097f49e1ef414e2acc2dc6368e11612806b
Author: Alessandro Barbieri gmail com>
AuthorDate: Sat Aug 7 23:38:35 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Sat Aug 7 23:38:57 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a2783097
sci-mathematics/the-omega-project: rename patch
Signed-off-by: Alessandro Barbieri gmail.com>
...nd-function.patch => the-omega-project-fix-fpermissive-errors.patch} | 0
.../the-omega-project/the-omega-project-2.1_p20131119.ebuild| 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git
a/sci-mathematics/the-omega-project/files/the-omega-project-petit-remove-default-argument-of-friend-function.patch
b/sci-mathematics/the-omega-project/files/the-omega-project-fix-fpermissive-errors.patch
similarity index 100%
rename from
sci-mathematics/the-omega-project/files/the-omega-project-petit-remove-default-argument-of-friend-function.patch
rename to
sci-mathematics/the-omega-project/files/the-omega-project-fix-fpermissive-errors.patch
diff --git
a/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
b/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
index 74b06ad51..ee5e18912 100644
--- a/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
+++ b/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild
@@ -36,7 +36,7 @@ PATCHES=(
"${FILESDIR}/${PN}-respect-flags.patch"
"${FILESDIR}/${PN}-include-Exit-h-in-util-h.patch"
"${FILESDIR}/${PN}-remove-default-argument-of-friend-function.patch"
-
"${FILESDIR}/${PN}-petit-remove-default-argument-of-friend-function.patch"
+ "${FILESDIR}/${PN}-fix-fpermissive-errors.patch"
)
src_prepare() {
[gentoo-commits] repo/proj/guru:dev commit in: sci-mathematics/the-omega-project/, sci-mathematics/the-omega-project/files/
commit: ead845b389330c68232ae12dc83719ea20698105
Author: Alessandro Barbieri gmail com>
AuthorDate: Sat Aug 7 23:37:23 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Sat Aug 7 23:38:57 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ead845b3
sci-mathematics/the-omega-project: initial import
Signed-off-by: Alessandro Barbieri gmail.com>
sci-mathematics/the-omega-project/Manifest | 1 +
...he-omega-project-include-Exit-h-in-util-h.patch | 10 ++
...emove-default-argument-of-friend-function.patch | 142 +
...emove-default-argument-of-friend-function.patch | 80
.../files/the-omega-project-respect-flags.patch| 45 +++
sci-mathematics/the-omega-project/metadata.xml | 25
.../the-omega-project-2.1_p20131119.ebuild | 70 ++
7 files changed, 373 insertions(+)
diff --git a/sci-mathematics/the-omega-project/Manifest
b/sci-mathematics/the-omega-project/Manifest
new file mode 100644
index 0..348a75343
--- /dev/null
+++ b/sci-mathematics/the-omega-project/Manifest
@@ -0,0 +1 @@
+DIST the-omega-project-2.1_p20131119.tar.gz 2448617 BLAKE2B
2700354ff1dd23cf4169c1a894feb0b09c9ef064d12eb514faf8bed50b7e8eb2692326e398b57b6ea81d3e89f2181024e6c2f79de6009f1938710d86a16116b4
SHA512
c02a96206349ea44545acb685d7d54a2ec8b0553ace6907afc89924a1f33cf86aa00d3a84ed5265e18cc83b07b09c0e354139e72c8d0bd1a7b7314b3e95e0145
diff --git
a/sci-mathematics/the-omega-project/files/the-omega-project-include-Exit-h-in-util-h.patch
b/sci-mathematics/the-omega-project/files/the-omega-project-include-Exit-h-in-util-h.patch
new file mode 100644
index 0..0421eacf8
--- /dev/null
+++
b/sci-mathematics/the-omega-project/files/the-omega-project-include-Exit-h-in-util-h.patch
@@ -0,0 +1,10 @@
+--- a/basic/include/basic/util.h
b/basic/include/basic/util.h
+@@ -31,6 +31,7 @@
+
+
+ #include
++#include
+
+ namespace omega {
+
diff --git
a/sci-mathematics/the-omega-project/files/the-omega-project-petit-remove-default-argument-of-friend-function.patch
b/sci-mathematics/the-omega-project/files/the-omega-project-petit-remove-default-argument-of-friend-function.patch
new file mode 100644
index 0..7b2d693da
--- /dev/null
+++
b/sci-mathematics/the-omega-project/files/the-omega-project-petit-remove-default-argument-of-friend-function.patch
@@ -0,0 +1,142 @@
+--- a/petit/include/petit/Zima.h
b/petit/include/petit/Zima.h
+@@ -67,13 +67,13 @@ public:
+ // If already_done != NULL, stop adding constraints when we get there
+
+ friend void access_in_bounds(F_And *N, const AccessIteration ,
+- context_iterator already_done = 0,
+- bool assertions = true);
++ context_iterator already_done,
++ bool assertions);
+
+ friend void context_in_bounds(F_And *N, const AccessIteration ,
+context_iterator c,
+- context_iterator already_done = 0,
+- bool assertions = true);
++ context_iterator already_done,
++ bool assertions);
+
+ //
+ // For A[I] and B[J] to access the same memory location,
+@@ -86,7 +86,7 @@ public:
+ //
+ friend void access_same_memory(F_And *N, const AccessIteration ,
+ const AccessIteration );
+-
++
+ friend void subscripts_equal_to_tuple (F_And *N, const AccessIteration
,
+ const Variable_ID_Tuple *t);
+
+--- a/petit/src/add-assert.c
b/petit/src/add-assert.c
+@@ -110,11 +110,11 @@ build_zap_problem(dd_current dd, Relation *r)
+
+ context_iterator c = cont_i_for_access(src.access());
+ while (!cont_i_done(c) && !cont_i_cur_is_loop(c)) cont_i_next(c);
+-if (!cont_i_done(c)) context_in_bounds(le, src, c);
++if (!cont_i_done(c)) context_in_bounds(le, src, c, 0, true);
+
+ c = cont_i_for_access(dest.access());
+ while (!cont_i_done(c) && !cont_i_cur_is_loop(c)) cont_i_next(c);
+-if (!cont_i_done(c)) context_in_bounds(le, dest, c);
++if (!cont_i_done(c)) context_in_bounds(le, dest, c, 0, true);
+
+ assert(copy(loops_execute).is_upper_bound_satisfiable());
+
+--- a/petit/src/browsedd.c
b/petit/src/browsedd.c
+@@ -637,8 +637,8 @@ void write_deps(char *filename , char *inputfile,
+
+ F_And *f = it.add_and();
+
+- access_in_bounds(f, a);
+- access_in_bounds(f, b);
++ access_in_bounds(f, a, 0, true);
++ access_in_bounds(f, b, 0, true);
+ it.finalize();
+
+
