diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2023-05-02 16:24:55 +0200 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2023-05-02 16:25:12 +0200 |
| commit | 55f6641933bde51d14c1a67fe0957b997e122031 (patch) | |
| tree | 4f161e8136b5676d02394eea66bec2b2487891cc /sci-libs/gklib | |
| parent | net-proxy/haproxy: Bump to 2.6.13 (diff) | |
| download | gentoo-55f6641933bde51d14c1a67fe0957b997e122031.tar.gz gentoo-55f6641933bde51d14c1a67fe0957b997e122031.tar.bz2 gentoo-55f6641933bde51d14c1a67fe0957b997e122031.zip | |
sci-libs/gklib: respect user flags
Closes: https://bugs.gentoo.org/905469
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-libs/gklib')
| -rw-r--r-- | sci-libs/gklib/files/gklib-5.1.1_p20230327-respect-user-flags.patch | 51 | ||||
| -rw-r--r-- | sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild (renamed from sci-libs/gklib/gklib-5.1.1_p20230327.ebuild) | 1 |
2 files changed, 52 insertions, 0 deletions
diff --git a/sci-libs/gklib/files/gklib-5.1.1_p20230327-respect-user-flags.patch b/sci-libs/gklib/files/gklib-5.1.1_p20230327-respect-user-flags.patch new file mode 100644 index 000000000000..bbad20ee1113 --- /dev/null +++ b/sci-libs/gklib/files/gklib-5.1.1_p20230327-respect-user-flags.patch @@ -0,0 +1,51 @@ +diff --git a/GKlibSystem.cmake b/GKlibSystem.cmake +index 31a1cf1..15ccfe7 100644 +--- a/GKlibSystem.cmake ++++ b/GKlibSystem.cmake +@@ -31,21 +31,6 @@ endif(CYGWIN) + if(CMAKE_COMPILER_IS_GNUCC) + # GCC opts. + set(GKlib_COPTIONS "${GKlib_COPTIONS} -std=c99 -fno-strict-aliasing") +-if(VALGRIND) +- set(GKlib_COPTIONS "${GK_COPTIONS} -march=x86-64 -mtune=generic") +-else() +-# -march=native is not a valid flag on PPC: +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "power|ppc|powerpc|ppc64|powerpc64" OR (APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")) +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -mtune=native") +-else() +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -march=native") +-endif() +-endif(VALGRIND) +- if(NOT MINGW) +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -fPIC") +- endif(NOT MINGW) +-# GCC warnings. +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GKlib_COPTIONS "${GKlib_COPTIONS} -xc99") +@@ -71,24 +56,6 @@ if(NO_X86) + set(GKlib_COPTIONS "${GKlib_COPTIONS} -DNO_X86=${NO_X86}") + endif(NO_X86) + +-# Add various definitions. +-if(GDB) +- set(GKlib_COPTS "${GKlib_COPTS} -g") +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror") +-else() +- set(GKlib_COPTS "-O3") +-endif(GDB) +- +- +-if(DEBUG) +- set(GKlib_COPTS "-g") +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -DDEBUG") +-endif(DEBUG) +- +-if(GPROF) +- set(GKlib_COPTS "-pg") +-endif(GPROF) +- + if(NOT ASSERT) + set(GKlib_COPTIONS "${GKlib_COPTIONS} -DNDEBUG") + endif(NOT ASSERT) diff --git a/sci-libs/gklib/gklib-5.1.1_p20230327.ebuild b/sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild index 487afc8fe562..87573b9748ae 100644 --- a/sci-libs/gklib/gklib-5.1.1_p20230327.ebuild +++ b/sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild @@ -18,4 +18,5 @@ KEYWORDS="~amd64" PATCHES=( "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-respect-user-flags.patch" ) |