* [gentoo-commits] repo/proj/guru:dev commit in: sci-misc/boinc-wrapper/, sci-misc/boinc-wrapper/files/
@ 2021-05-22 19:06 Anna Vyalkova
0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2021-05-22 19:06 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-misc/boinc-wrapper/, sci-misc/boinc-wrapper/files/
@ 2022-08-02 1:05 Yuan Liao
0 siblings, 0 replies; 4+ messages in thread
From: Yuan Liao @ 2022-08-02 1:05 UTC (permalink / raw
To: gentoo-commits
commit: 5e6b63452d4dba09353a0181b4d4df7c0fda2657
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Tue Aug 2 00:59:39 2022 +0000
Commit: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Tue Aug 2 01:00:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e6b6345
sci-misc/boinc-wrapper: Add 7.20.2, drop 7.18.1
Following version bump of dependency sci-misc/boinc to 7.20.2, its old
7.18.1 version was dropped immediately, forcing this package to follow
suit at once.
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
sci-misc/boinc-wrapper/Manifest | 2 +-
.../{boinc-wrapper-7.18.1.ebuild => boinc-wrapper-7.20.2.ebuild} | 0
...-wrapper-7.18-makefile.patch => boinc-wrapper-7.20-makefile.patch} | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-misc/boinc-wrapper/Manifest b/sci-misc/boinc-wrapper/Manifest
index b9de5fbda..e3725d106 100644
--- a/sci-misc/boinc-wrapper/Manifest
+++ b/sci-misc/boinc-wrapper/Manifest
@@ -1 +1 @@
-DIST boinc-7.18.1.tar.gz 50851883 BLAKE2B 64d321c8c56d7c34a08646dc16de5ddbb9b8e4be57b673fa77515845d967e28b5cf1fda677293e2fc8cf36a18ac0b7e7feebfbd8e434ebed41b8280c7395950d SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532
+DIST boinc-7.20.2.tar.gz 46555666 BLAKE2B 4d11217739d341c5b61d86afa02eebdad80809f42caa3f6dea1d86ed53d79004d60fa362fd04d53060060472e108e0ee0aa0428e4799eb70f2e98f07dc1f39cd SHA512 0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.20.2.ebuild
similarity index 100%
rename from sci-misc/boinc-wrapper/boinc-wrapper-7.18.1.ebuild
rename to sci-misc/boinc-wrapper/boinc-wrapper-7.20.2.ebuild
diff --git a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.20-makefile.patch
similarity index 60%
rename from sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch
rename to sci-misc/boinc-wrapper/files/boinc-wrapper-7.20-makefile.patch
index 58a9e766e..b0f84f18f 100644
--- a/sci-misc/boinc-wrapper/files/boinc-wrapper-7.18-makefile.patch
+++ b/sci-misc/boinc-wrapper/files/boinc-wrapper-7.20-makefile.patch
@@ -15,6 +15,6 @@
regexp_report.o
-wrapper: wrapper.o $(MAKEFILE_STDLIB) $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
-- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(MAKEFILE_LDFLAGS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC)
+- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MINGW_WRAPPER_FLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(MAKEFILE_LDFLAGS) $(MINGW_ZIP_FIX) -lboinc_api -lboinc -lboinc_zip $(MINGW_LIBS) $(STDCPPTC)
+wrapper: wrapper.o $(REGEXP_OBJS)
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) -lboinc_api -lboinc -lboinc_zip $(STDCPPTC)
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MINGW_WRAPPER_FLAGS) -o wrapper wrapper.o $(REGEXP_OBJS) $(MINGW_ZIP_FIX) -lboinc_api -lboinc -lboinc_zip $(MINGW_LIBS) $(STDCPPTC)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-misc/boinc-wrapper/, sci-misc/boinc-wrapper/files/
@ 2022-10-09 8:51 Anna Vyalkova
0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2022-10-09 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 6efb684592b8e1e8403ea5eca2bf4a160bc2beef
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Oct 9 08:50:53 2022 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Oct 9 08:50:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6efb6845
sci-misc/boinc-wrapper: use system libboinc
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
.../boinc-wrapper/boinc-wrapper-7.20.2-r1.ebuild | 40 ++++++++++++++++++++++
sci-misc/boinc-wrapper/files/Makefile.gentoo | 17 +++++++++
2 files changed, 57 insertions(+)
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-7.20.2-r1.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-7.20.2-r1.ebuild
new file mode 100644
index 000000000..1392fc813
--- /dev/null
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.20.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BOINC_SUBMODULE="samples/wrapper"
+inherit boinc
+
+DESCRIPTION="Wrapper to use non-BOINC apps with BOINC"
+HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+LICENSE="LGPL-3+ regexp-UofT"
+SLOT="0"
+
+RDEPEND="
+ >=sci-misc/boinc-7.20
+ >=dev-libs/boinc-zip-7.20
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( job.xml )
+
+boinc_require_source
+
+boinc_override_config "${FILESDIR}"/config.override.h
+
+src_prepare() {
+ boinc_src_prepare
+ cp "${FILESDIR}"/Makefile.gentoo "${S}" || die
+}
+
+src_compile() {
+ emake -f Makefile.gentoo
+}
+
+src_install() {
+ einstalldocs
+ dobin boinc-wrapper
+}
diff --git a/sci-misc/boinc-wrapper/files/Makefile.gentoo b/sci-misc/boinc-wrapper/files/Makefile.gentoo
new file mode 100644
index 000000000..f023fa557
--- /dev/null
+++ b/sci-misc/boinc-wrapper/files/Makefile.gentoo
@@ -0,0 +1,17 @@
+PKGS = \
+ libboinc \
+ libboinc_api \
+ libboinc_zip
+
+REGEXP_OBJS = \
+ regexp.o \
+ regsub.o \
+ regerror.o \
+ regexp_memory.o \
+ regexp_report.o
+
+CXXFLAGS += $(shell pkg-config --cflags $(PKGS)) -I../..
+LIBS += $(shell pkg-config --libs $(PKGS))
+
+boinc-wrapper: wrapper.o $(REGEXP_OBJS)
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-misc/boinc-wrapper/, sci-misc/boinc-wrapper/files/
@ 2024-10-10 21:07 Anna Vyalkova
0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2024-10-10 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 4e094406d554b1c8240a662ed0e8afa1f09cd9d1
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Oct 10 21:02:56 2024 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Oct 10 21:02:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e094406
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 <cyber+gentoo <AT> sysrq.in>
...018-r1.ebuild => boinc-wrapper-26018-r3.ebuild} | 36 ++++++++++++++++------
.../files/boinc-wrapper-26018-makefile.patch | 13 ++++++++
2 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild b/sci-misc/boinc-wrapper/boinc-wrapper-26018-r3.ebuild
similarity index 56%
rename from sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild
rename to sci-misc/boinc-wrapper/boinc-wrapper-26018-r3.ebuild
index e388e52a2..f065fe7a5 100644
--- a/sci-misc/boinc-wrapper/boinc-wrapper-26018-r1.ebuild
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-26018-r3.ebuild
@@ -13,16 +13,18 @@ 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
@@ -30,12 +32,26 @@ src_prepare() {
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
new file mode 100644
index 000000000..c1329d6b1
--- /dev/null
+++ 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) \
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-10 21:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-22 19:06 [gentoo-commits] repo/proj/guru:dev commit in: sci-misc/boinc-wrapper/, sci-misc/boinc-wrapper/files/ Anna Vyalkova
-- strict thread matches above, loose matches on Subject: below --
2022-08-02 1:05 Yuan Liao
2022-10-09 8:51 Anna Vyalkova
2024-10-10 21:07 Anna Vyalkova
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox