commit: 1dc1bcfb7372e74b502952d87c2de827c243704c Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Sun Sep 5 03:37:43 2021 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Sun Sep 5 03:37:43 2021 +0000 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 <lssndrbarbieri <AT> 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() {
