| 1 |
commit: 1dc1bcfb7372e74b502952d87c2de827c243704c |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 5 03:37:43 2021 +0000 |
| 4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
| 5 |
CommitDate: Sun Sep 5 03:37:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1dc1bcfb |
| 7 |
|
| 8 |
sci-mathematics/the-omega-project: respect LDFLAGS, build PIE |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/807929 |
| 11 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 12 |
|
| 13 |
.../files/the-omega-project-respect-flags.patch | 21 ++++++++++++++++++++- |
| 14 |
.../the-omega-project-2.1_p20131119.ebuild | 2 +- |
| 15 |
2 files changed, 21 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index cf001299d..298297680 100644 |
| 19 |
--- a/sci-mathematics/the-omega-project/files/the-omega-project-respect-flags.patch |
| 20 |
+++ b/sci-mathematics/the-omega-project/files/the-omega-project-respect-flags.patch |
| 21 |
@@ -32,7 +32,7 @@ |
| 22 |
-LIB_DESTDIR=$(DESTDIR)/lib |
| 23 |
-BIN_DESTDIR=$(DESTDIR)/bin |
| 24 |
+INCL_DESTDIR=$(DESTDIR)/usr/include/omega |
| 25 |
-+LIB_DESTDIR=$(DESTDIR)/usr/lib |
| 26 |
++LIB_DESTDIR=$(DESTDIR)/usr/lib64 |
| 27 |
+BIN_DESTDIR=$(DESTDIR)/usr/bin |
| 28 |
|
| 29 |
# This is only used if you modify the grammar file. Use bison if you have it. |
| 30 |
@@ -43,3 +43,22 @@ |
| 31 |
MAKEDEPEND=makedepend |
| 32 |
-AR=ar |
| 33 |
- |
| 34 |
+--- a/Makefile.rules |
| 35 |
++++ b/Makefile.rules |
| 36 |
+@@ -32,14 +32,14 @@ |
| 37 |
+ LIBS=$(REQ_LIBS) $(STD_LIBS) $(TARGET_LIBS) $(OS_LIBS) $(EXTRA_LIBS) |
| 38 |
+ |
| 39 |
+ CFLAGS=$(STD_CFLAGS) $(OPTIMIZATION_CFLAGS) $(COMPILER_CFLAGS) $(OS_CFLAGS) $(TARGET_CFLAGS) $(INCL_PATH) |
| 40 |
+-LDFLAGS=$(STD_LDFLAGS) $(OPTIMIZATION_CFLAGS) $(TARGET_LDFLAGS) $(LIB_PATH) $(LIBS) |
| 41 |
++LDFLAGS+=$(STD_LDFLAGS) $(OPTIMIZATION_CFLAGS) $(TARGET_LDFLAGS) $(LIB_PATH) $(LIBS) |
| 42 |
+ |
| 43 |
+ ALLDIRS=omega_lib omega_calc petit uniform code_gen basic parse_lib |
| 44 |
+ #ALLDIRS=omega_lib omega_calc petit code_gen basic |
| 45 |
+ |
| 46 |
+ # Executable target; can have only one per directory |
| 47 |
+ .executable: required_libs $(OBJS) |
| 48 |
+- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(TARGET) |
| 49 |
++ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -fPIE -o $(TARGET) |
| 50 |
+ touch .executable |
| 51 |
+ |
| 52 |
+ |
| 53 |
|
| 54 |
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 |
| 55 |
index 494b4f982..520f7c0ef 100644 |
| 56 |
--- a/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild |
| 57 |
+++ b/sci-mathematics/the-omega-project/the-omega-project-2.1_p20131119.ebuild |
| 58 |
@@ -45,7 +45,7 @@ src_prepare() { |
| 59 |
use debug || append-cxxflags '-DNDEBUG' |
| 60 |
use gui || append-cxxflags '-DBATCH_ONLY_PETIT' |
| 61 |
tc-export CXX RANLIB |
| 62 |
- sed -e "s|/usr/lib|/usr/$(get_libdir)|g" -i Makefile.config || die |
| 63 |
+ sed -e "s|/usr/lib64|/usr/$(get_libdir)|g" -i Makefile.config || die |
| 64 |
} |
| 65 |
|
| 66 |
src_compile() { |
Archives