diff options
| author |   Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> | 2023-03-18 20:58:08 +0100 |
|---|---|---|
| committer |   Ulrich Müller <ulm@gentoo.org> | 2023-03-18 21:03:13 +0100 |
| commit | c497ddda658af5747f1c3a1f72df7b80cec047bd (patch) | |
| tree | 3168c53c353f961e3c8dcc92576757bfb6330192 | |
| parent | dev-db/postgresql: Adjust to llvm:16 (diff) | |
| download | gentoo-c497ddda.tar.gz gentoo-c497ddda.tar.bz2 gentoo-c497ddda.zip | |
app-admin/calamares: respect LDFLAGS
Closes: https://bugs.gentoo.org/865281
Signed-off-by: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | app-admin/calamares/calamares-3.2.60-r1.ebuild (renamed from app-admin/calamares/calamares-3.2.60.ebuild) | 4 | ||||
| -rw-r--r-- | app-admin/calamares/files/calamares-3.2.60-ldflags.patch | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/app-admin/calamares/calamares-3.2.60.ebuild b/app-admin/calamares/calamares-3.2.60-r1.ebuild index 138cda4176eb..0a569c256030 100644 --- a/app-admin/calamares/calamares-3.2.60.ebuild +++ b/app-admin/calamares/calamares-3.2.60-r1.ebuild @@ -64,6 +64,10 @@ RDEPEND="${COMMON_DEPEND} upower? ( sys-power/upower ) " +PATCHES=( + "${FILESDIR}/${P}-ldflags.patch" +) + src_prepare() { ecm_src_prepare export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \ diff --git a/app-admin/calamares/files/calamares-3.2.60-ldflags.patch b/app-admin/calamares/files/calamares-3.2.60-ldflags.patch new file mode 100644 index 000000000000..f81c49b50641 --- /dev/null +++ b/app-admin/calamares/files/calamares-3.2.60-ldflags.patch @@ -0,0 +1,14 @@ +From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> +Bug: https://bugs.gentoo.org/865281 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -203,7 +203,7 @@ set( CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG" ) + set( CMAKE_C_FLAGS_RELEASE "-O4 -DNDEBUG" ) + set( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" ) + +-set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--fatal-warnings" ) ++set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}" ) + + if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) + message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." ) |