[gentoo-commits] repo/proj/guru:dev commit in: sci-misc/boinc-wrapper/, sci-misc/boinc-wrapper/files/

["Anna Vyalkova" <cyber+gentoo@sysrq.in>]

commit:     21b133c97c94fe32c04b0d9754425e6c0de27b01
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat May 22 17:52:52 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sat May 22 19:06:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=21b133c9

sci-misc/boinc-wrapper: fix ldflags

Closes: https://bugs.gentoo.org/791421
Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>

 .../boinc-wrapper/boinc-wrapper-7.16.16.ebuild     |  4 ++--
 .../files/boinc-wrapper-7.16-makefile.patch        | 25 ++++++++++++++++++++++
 sci-misc/boinc-wrapper/files/makefile.patch        | 10 ---------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild
index e19b25ceb..becebc0ab 100644
--- a/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.16.16.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/makefile.patch )
+PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch )
 DOCS=( ReadMe.txt job.xml )
 
 src_prepare() {
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_configure() {
 	cd ../.. || die
-	econf --enable-pkg-devel --disable-static
+	econf --enable-pkg-devel --disable-static --disable-fcgi --without-x
 }
 
 src_compile() {

diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch
new file mode 100644
index 000000000..f503ba847
--- /dev/null
+++ b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.16-makefile.patch
@@ -0,0 +1,25 @@
+diff --git a/samples/wrapper/Makefile b/samples/wrapper/Makefile
+index c20af9446d..5ecd76c45d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,8 +7,7 @@ BOINC_LIB_DIR = $(BOINC_DIR)/lib
+ BOINC_ZIP_DIR = $(BOINC_DIR)/zip
+ PTHREAD = -pthread
+ 
+-CXXFLAGS += -g -O0 \
+-	-Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -fno-common \
++CXXFLAGS += \
+     -I$(BOINC_DIR) \
+     -I$(BOINC_LIB_DIR) \
+     -I$(BOINC_API_DIR) \
+@@ -41,5 +40,5 @@ REGEXP_OBJS = \
+ 	regexp_memory.o \
+ 	regexp_report.o
+ 
+-wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
+-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip
++wrapper: wrapper.o $(REGEXP_OBJS)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(PTHREAD) -lboinc_api -lboinc -lboinc_zip $(LDFLAGS)
+-- 
+2.31.1
+

diff --git a/sci-misc/boinc-wrapper/files/makefile.patch b/sci-misc/boinc-wrapper/files/makefile.patch
deleted file mode 100644
index 6e0359ec3..000000000
--- a/sci-misc/boinc-wrapper/files/makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -41,5 +41,5 @@
- 	regexp_memory.o \
- 	regexp_report.o
- 
--wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
--	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) libstdc++.a $(PTHREAD) -lboinc_api -lboinc -lboinc_zip
-+wrapper: wrapper.o $(REGEXP_OBJS)
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(PTHREAD) -lboinc_api -lboinc -lboinc_zip