Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d8c168b

Browse files
Optimise some build steps
1 parent 6e5a163 commit d8c168b

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

‎Dockerfile.curl-7.79.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cd curl-* && \
1313
echo '#!/bin/sh\nexec $MUSL_TARGET-gcc -static "$@"' > /usr/local/bin/gcc && \
1414
chmod +x /usr/local/bin/gcc && \
1515
export CC="/usr/local/bin/gcc" && \
16-
export CFLAGS="-fPIC -frandom-seed=pulse" && \
16+
export CFLAGS="-frandom-seed=pulse" && \
1717
export CPPFLAGS="-I/output/include" && \
1818
export LDFLAGS="-L/output/lib" && \
1919
./configure \

‎Dockerfile.nmap-7.90

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
ARG MUSL_TARGET=x86_64-linux-musl
2+
FROM pcre-8.45-${MUSL_TARGET} AS pcre
3+
FROM zlib-1.2.11-${MUSL_TARGET} AS zlib
24
FROM libpcap-1.10.1-${MUSL_TARGET} AS libpcap
35
FROM openssl-1.1.1k-${MUSL_TARGET} AS openssl
46
FROM musl-cross-make-${MUSL_TARGET}
57
ARG MUSL_TARGET
68

9+
COPY --from=pcre /output /output
10+
COPY --from=zlib /output /output
711
COPY --from=libpcap /output /output
812
COPY --from=openssl /output /output
913

1014
WORKDIR /build
1115
RUN download https://nmap.org/dist/nmap-7.92.tgz source.tar.gz 064183ea642dc4c12b1ab3b5358ce1cef7d2e7e11ffa2849f16d339f5b717117 && tar xf source.tar.gz
1216
RUN export PATH=/build/cross/bin:$PATH && \
1317
cd nmap-* && \
14-
CC="${MUSL_TARGET}-gcc -static -fPIC" \
15-
CXX="${MUSL_TARGET}-g++ -static -fPIC -static-libstdc++" \
18+
CC="${MUSL_TARGET}-gcc -static" \
19+
CXX="${MUSL_TARGET}-g++ -static -static-libstdc++" \
1620
CFLAGS="-frandom-seed=pulse -I/output/include" \
17-
CPPFLAGS="-frandom-seed=pulse -I/output/include" \
1821
LDFLAGS="-L/output/lib" \
1922
./configure \
20-
-enable-shared=no \
23+
--enable-shared=no \
2124
--enable-static=yes \
2225
--prefix=/output \
2326
--with-pcap=linux \
@@ -27,6 +30,8 @@ LDFLAGS="-L/output/lib" \
2730
--without-nmap-update \
2831
--without-zenmap \
2932
--with-openssl=/output \
33+
--with-libz=/output \
34+
--with-libpcre=/output \
3035
--host=$($MUSL_TARGET-gcc -dumpmachine) && \
3136
make -j$(nproc) static && \
3237
make install && \

‎Dockerfile.openssl-1.1.1k

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN download https://www.openssl.org/source/openssl-1.1.1k.tar.gz source.tar.gz
77
RUN export PATH=/build/cross/bin:$PATH && \
88
cd openssl-* && \
99
CC="gcc" \
10-
CFLAGS="-static -fPIC -frandom-seed=pulse -I/output/include" \
10+
CFLAGS="-static -frandom-seed=pulse -I/output/include" \
1111
LDFLAGS="-L/output/lib" \
1212
./Configure \
1313
--cross-compile-prefix=$MUSL_TARGET- \

‎Dockerfile.pcre-8.45

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ RUN download https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.gz source.tar.gz 4e6ce0
77
RUN export PATH=/build/cross/bin:$PATH && \
88
cd pcre-* && \
99
CC="$MUSL_TARGET-gcc" \
10-
CFLAGS="-fPIC -static -frandom-seed=pulse" \
10+
CFLAGS="-static -frandom-seed=pulse" \
1111
./configure \
12+
--disable-shared \
13+
--enable-static \
1214
--host=$($MUSL_TARGET-gcc -dumpmachine) \
1315
--prefix=/output && \
1416
make -j$(nproc) && \

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ socat-1.7.4.1: readline-8.1 openssl-1.1.1k
6565
$(DOCKER_BUILD)
6666
$(GRABBY_HANDS) /output/bin/socat /grabby/$@
6767

68-
nmap-7.90: openssl-1.1.1k libpcap-1.10.1
68+
nmap-7.90: openssl-1.1.1k libpcap-1.10.1 zlib-1.2.11 pcre-8.45
6969
$(DOCKER_BUILD)
7070
$(GRABBY_HANDS) /output/bin/nmap /grabby/$@
7171

‎git.build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ tasks:
1111
cd static-binary-zoo || exit 1
1212
make git-2.33.0
1313
- bundle: |
14-
tar -C static-binary-zoo/output -z -c -v -f git-2.33.0.tar.gz *
14+
tar -C static-binary-zoo -z -c -v -f git-2.33.0.tar.gz output
1515
artifacts:
1616
- git-2.33.0.tar.gz

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /