Skip to content

Commit b6b695d

Browse files
authored
Merge pull request #2 from timower/main
Only static link gnutls
2 parents b8a7758 + 36ea398 commit b6b695d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
push:
44
tags:
55
- '*'
6+
branches:
7+
- main
8+
pull_request:
69
jobs:
710
build:
811
name: Build the wget binary
@@ -23,6 +26,7 @@ jobs:
2326
name: Publish the wget binary
2427
runs-on: ubuntu-latest
2528
needs: build
29+
if: startsWith(github.ref, 'refs/tags/v')
2630
steps:
2731
- name: Fetch the built binary
2832
uses: actions/download-artifact@v2

build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ rm nettle.tar.gz
4545
--disable-shared \
4646
--disable-documentation \
4747
--disable-assembler
48-
make
48+
make -j $(nproc)
4949
make install
5050

5151
popd
@@ -69,7 +69,7 @@ rm gnutls.tar.xz
6969
--with-included-libtasn1 \
7070
--with-included-unistring \
7171
--without-p11-kit
72-
make
72+
make -j $(nproc)
7373
make install
7474

7575
popd
@@ -84,11 +84,11 @@ fetch https://ftp.gnu.org/gnu/wget/wget-1.21.1.tar.gz wget.tar.gz \
8484
tar --strip-components=1 -zxf wget.tar.gz
8585
rm wget.tar.gz
8686

87-
export GNUTLS_LIBS="-L$SYSROOT/usr/lib -static -lgnutls -pthread -latomic -lhogweed -lnettle"
87+
export GNUTLS_LIBS="-L$SYSROOT/usr/lib -Wl,-Bstatic -lgnutls -Wl,-Bdynamic -pthread -latomic -lhogweed -lnettle"
8888
./configure \
8989
--prefix="$SYSROOT/usr" \
9090
--host="$CHOST"
91-
make
91+
make -j $(nproc)
9292

9393
popd
9494
mv wget-build/src/wget .

0 commit comments

Comments
 (0)