sci-misc/boinc-wrapper: fix cflags

Also don't link C++ stdlib statically and mark implicit decls. Closes: https://bugs.gentoo.org/887995 Closes: https://bugs.gentoo.org/904138 Closes: https://bugs.gentoo.org/922046 Signed-off-by: Anna (cybertailor) Vyalkova <[email protected]>
gentoo · Oct 10, 2024 · 4e09440 · 4e09440
1 parent 1a97cd3
commit 4e09440
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 10 deletions.
diff --git a/...inc-wrapper/boinc-wrapper-26018-r1.ebuild → ...inc-wrapper/boinc-wrapper-26018-r3.ebuild b/...inc-wrapper/boinc-wrapper-26018-r1.ebuild → ...inc-wrapper/boinc-wrapper-26018-r3.ebuild
@@ -13,29 +13,45 @@ LICENSE="Info-ZIP LGPL-3+ regexp-UofT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-# libboinc-api dependencies
-# no subslot, because "-Wl,--as-needed" removes them
-DEPEND="
- dev-libs/openssl
- media-libs/freeglut
- media-libs/libjpeg-turbo
-"
-
 DOCS=( job.xml )
 
+PATCHES=(
+ "${FILESDIR}"/${PN}-26018-makefile.patch
+ "${FILESDIR}"/${PN}-26018-sigstop.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # https://bugs.gentoo.org/922046
+ "_mm*"
+)
+
 src_prepare() {
  default
  eautoreconf
 }
 
 src_configure() {
  edo bash generate_svn_version.sh
- econf --enable-static --enable-pkg-devel --disable-fcgi
+
+ local myeconfargs=(
+ # build libraries only
+ --enable-pkg-devel
+ --disable-fcgi
+
+ # link with libboinc_api statically
+ --disable-shared
+ --enable-static
+
+ # do not build libboinc_graphics
+ --without-x
+ ax_cv_check_gl_libgl=no
+ )
+ econf "${myeconfargs[@]}"
 }
 
 src_compile() {
  emake
- emake -C samples/wrapper
+ emake -C samples/wrapper MAKEFILE_LDFLAGS="-lpthread" MAKEFILE_STDLIB=
 }
 
 src_install() {

diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-26018-makefile.patch b/sci-misc/boinc-wrapper/files/boinc-wrapper-26018-makefile.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/904138
+
+--- a/samples/wrapper/Makefile
++++ b/samples/wrapper/Makefile
+@@ -22,7 +22,7 @@ else
+ MAKEFILE_STDLIB = libstdc++.a
+ endif
+
+-CXXFLAGS += -g -O0 \
++CXXFLAGS += \
+ -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
+ -I$(BOINC_DIR) \
+ -I$(BOINC_LIB_DIR) \