diff options
| author |   Takuya Wakazono <pastalian46@gmail.com> | 2024-05-31 22:41:31 +0900 |
|---|---|---|
| committer | Takuya Wakazono <pastalian46@gmail.com> | 2024-05-31 22:46:20 +0900 |
| commit | a623d8f121d3521b1512fb9dc789248721261a9b (patch) | |
| tree | c2ef0fae99642991632b805920bd73cd0e1524ee /gui-libs | |
| parent | profiles: unmask treecleaned package (diff) | |
| download | guru-a623d8f121d3521b1512fb9dc789248721261a9b.tar.gz guru-a623d8f121d3521b1512fb9dc789248721261a9b.tar.bz2 guru-a623d8f121d3521b1512fb9dc789248721261a9b.zip | |
gui-libs/mir: respect CFLAGS
Fix CFLAGS and add missing dependencies.
Closes: https://bugs.gentoo.org/932785
Closes: https://bugs.gentoo.org/932786
Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
Diffstat (limited to 'gui-libs')
| -rw-r--r-- | gui-libs/mir/files/mir-2.17.0-remove-debug-flags.patch | 15 | ||||
| -rw-r--r-- | gui-libs/mir/mir-2.17.0-r1.ebuild (renamed from gui-libs/mir/mir-2.17.0.ebuild) | 12 |
2 files changed, 26 insertions, 1 deletions
diff --git a/gui-libs/mir/files/mir-2.17.0-remove-debug-flags.patch b/gui-libs/mir/files/mir-2.17.0-remove-debug-flags.patch new file mode 100644 index 000000000..09b79ac43 --- /dev/null +++ b/gui-libs/mir/files/mir-2.17.0-remove-debug-flags.patch @@ -0,0 +1,15 @@ +Remove -g flags. +https://bugs.gentoo.org/932786 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,8 +62,8 @@ set(CMAKE_CXX_STANDARD 23) + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -g -Wall -pedantic -Wextra -fPIC") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -Wall -pedantic -Wextra -fPIC") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") diff --git a/gui-libs/mir/mir-2.17.0.ebuild b/gui-libs/mir/mir-2.17.0-r1.ebuild index 30e0fda31..00c0b651e 100644 --- a/gui-libs/mir/mir-2.17.0.ebuild +++ b/gui-libs/mir/mir-2.17.0-r1.ebuild @@ -16,6 +16,7 @@ IUSE="examples test" RESTRICT="!test? ( test )" RDEPEND=" + dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-cpp/yaml-cpp:= dev-libs/boost:= @@ -27,10 +28,13 @@ RDEPEND=" media-libs/libepoxy media-libs/libglvnd media-libs/mesa - x11-libs/libdrm + sys-apps/util-linux + x11-libs/libX11 x11-libs/libXcursor + x11-libs/libdrm x11-libs/libxcb:= x11-libs/libxkbcommon + virtual/libudev:= " DEPEND=" ${RDEPEND} @@ -47,6 +51,11 @@ BDEPEND=" ) " +PATCHES=( + # bug 932786 + "${FILESDIR}/${P}-remove-debug-flags.patch" +) + src_prepare() { cmake_src_prepare use examples || cmake_comment_add_subdirectory examples/ @@ -57,6 +66,7 @@ src_configure() { # wlcs is not packaged -DMIR_ENABLE_WLCS_TESTS=OFF -DMIR_ENABLE_TESTS="$(usex test)" + -DMIR_FATAL_COMPILE_WARNINGS=OFF ) use test && mycmakeargs+=( # likely will not work in build environment |