sci-misc/boinc-wrapper: fix ldflags

Closes: https://bugs.gentoo.org/791421
Signed-off-by: Anna Vyalkova <cyber+gentoo@sysrq.in>
This commit is contained in:
Anna Vyalkova
2021-05-22 22:52:52 +05:00
parent d7352d839c
commit 21b133c97c
3 changed files with 27 additions and 12 deletions

View File

@@ -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() {

View File

@@ -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

View File

@@ -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