Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/riseup-vpn/files/, net-vpn/riseup-vpn/
Date: Thu, 23 Sep 2021 10:00:14
Message-Id: 1632391207.dcc8efa65dcc8dc4c8f142403d554dda3d970869.andrewammerlaan@gentoo
1 commit: dcc8efa65dcc8dc4c8f142403d554dda3d970869
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 23 09:59:27 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 23 10:00:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc8efa6
7
8 net-vpn/riseup-vpn: respect user setting for AR
9
10 Closes: https://bugs.gentoo.org/814017
11 Package-Manager: Portage-3.0.23, Repoman-3.0.3
12 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
13
14 .../riseup-vpn/files/riseup-vpn-respect-AR.patch | 38 ++++++++++++++++++++++
15 net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild | 8 +++--
16 2 files changed, 44 insertions(+), 2 deletions(-)
17
18 diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
19 new file mode 100644
20 index 00000000000..431ab1376c6
21 --- /dev/null
22 +++ b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
23 @@ -0,0 +1,38 @@
24 +diff --git a/gui/build.sh b/gui/build.sh
25 +index 56e3d66..9e519a6 100755
26 +--- a/gui/build.sh
27 ++++ b/gui/build.sh
28 +@@ -63,13 +63,13 @@ function buildGoLib {
29 + if [ "$XBUILD" == "no" ]
30 + then
31 + echo "[+] Building Go library with standard Go compiler"
32 +- CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
33 ++ CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB
34 + fi
35 + if [ "$XBUILD" == "$WIN64" ]
36 + then
37 + echo "[+] Building Go library with mxe"
38 + echo "[+] Using cc:" $CC
39 +- CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
40 ++ CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB
41 + fi
42 + }
43 +
44 +@@ -77,7 +77,7 @@ function buildQmake {
45 + echo "[+] Now building Qml app with Qt qmake"
46 + echo "[+] Using qmake in:" $QMAKE
47 + mkdir -p $QTBUILD
48 +- $QMAKE -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
49 ++ $QMAKE -early QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
50 + #CONFIG=+force_debug_info CONFIG+=debug CONFIG+=debug_and_release
51 + }
52 +
53 +@@ -115,7 +115,7 @@ function buildDefault {
54 + buildQmake
55 +
56 + make -C $QTBUILD clean
57 +- make -C $QTBUILD -j4 all
58 ++ make -C $QTBUILD $MAKEFLAGS all
59 +
60 + renameOutput
61 + echo "[+] Done."
62
63 diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
64 index 41c0814e1dc..91db3c97816 100644
65 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
66 +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
67 @@ -9,7 +9,7 @@ DOCS_DEPEND="dev-python/alabaster"
68
69 PYTHON_COMPAT=( python3_{8..10} )
70
71 -inherit desktop python-single-r1 docs go-module virtualx xdg
72 +inherit desktop python-single-r1 docs go-module virtualx toolchain-funcs xdg
73
74 EGO_SUM=(
75 "0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2"
76 @@ -91,7 +91,10 @@ RDEPEND="${DEPEND}
77 "
78
79 # ip command is in bin instead of sbin on Gentoo
80 -PATCHES=( "${FILESDIR}/${PN}-ip-location.patch" )
81 +PATCHES=(
82 + "${FILESDIR}/${PN}-ip-location.patch"
83 + "${FILESDIR}/${PN}-respect-AR.patch"
84 +)
85
86 S="${WORKDIR}/bitmask-vpn-${PV}"
87
88 @@ -108,6 +111,7 @@ src_prepare() {
89
90 src_compile() {
91 # does not build with j>1
92 + tc-export AR LD CC CXX
93 emake -j1 build
94 docs_compile
95 }