From 8dd7e8222fa65cb8fd3fed1fb8fbd8a96a6f351747a8aa1a111ba10c48b8548d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 8 Apr 2024 07:54:21 +0000 Subject: [PATCH] Accepting request 1140010 from home:StefanBruens:branches:devel:tools:building See https://build.opensuse.org/request/show/1140009 - Revert the linker flags revert. Instead of increasing differences between SLE/Leap and Tumbleweed and risking silent breakage of dozens of packages due to underlinking, fix the one failing package. OBS-URL: https://build.opensuse.org/request/show/1140010 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=577 --- cmake.changes | 8 ++++++++ cmake.macros | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake.changes b/cmake.changes index 92a5d7f..51e8dec 100644 --- a/cmake.changes +++ b/cmake.changes @@ -33,6 +33,14 @@ Wed Feb 14 16:46:22 UTC 2024 - Fridrich Strba + fix JVM detection on JDKs with ZERO virtual machine, like java-21-openjdk for armv6l +------------------------------------------------------------------- +Fri Jan 19 19:25:29 UTC 2024 - Stefan Brüns + +- Revert the linker flags revert. Instead of increasing differences + between SLE/Leap and Tumbleweed and risking silent breakage of + dozens of packages due to underlinking, fix the one failing + package. + ------------------------------------------------------------------- Fri Jan 19 15:26:23 UTC 2024 - Dirk Müller diff --git a/cmake.macros b/cmake.macros index 15d6ce9..9241ec7 100644 --- a/cmake.macros +++ b/cmake.macros @@ -43,9 +43,9 @@ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \\\ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ - -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ + -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed" \\\ - -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,-z,now" \\\ + -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \