Move static build files in .static

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-09-11 21:08:59 +00:00
parent 7c17e16fea
commit 264f26286d
3 changed files with 14 additions and 4 deletions

1
.gitignore vendored
View File

@@ -10,6 +10,7 @@ configure
build-aux build-aux
.deps .deps
.dirstamp .dirstamp
.static
glorytun glorytun
build* build*
VERSION VERSION

View File

@@ -11,8 +11,8 @@ CFLAGS ?= -std=c11 -O2 -Wall -fstack-protector-strong
FLAGS := $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) FLAGS := $(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
FLAGS += -DPACKAGE_NAME=\"$(NAME)\" -DPACKAGE_VERSION=\"$(VERSION)\" FLAGS += -DPACKAGE_NAME=\"$(NAME)\" -DPACKAGE_VERSION=\"$(VERSION)\"
FLAGS += -Ilibsodium-stable/src/libsodium/include FLAGS += -I.static/$(CROSS)/libsodium-stable/src/libsodium/include
FLAGS += -Llibsodium-stable/src/libsodium/.libs FLAGS += -L.static/$(CROSS)/libsodium-stable/src/libsodium/.libs
SRC := argz/argz.c mud/mud.c $(wildcard src/*.c) SRC := argz/argz.c mud/mud.c $(wildcard src/*.c)

View File

@@ -1,7 +1,11 @@
#!/bin/sh #!/bin/sh
mkdir -p .static
cd .static || exit 1
file=LATEST.tar.gz file=LATEST.tar.gz
url=https://download.libsodium.org/libsodium/releases url=https://download.libsodium.org/libsodium/releases
dir="$PWD"
[ -f "$file" ] || wget -q "$url/$file" -O "$file" [ -f "$file" ] || wget -q "$url/$file" -O "$file"
[ -f "$file" ] || curl -SsfLO "$url/$file" [ -f "$file" ] || curl -SsfLO "$url/$file"
@@ -10,9 +14,14 @@ url=https://download.libsodium.org/libsodium/releases
exit 1 exit 1
} }
if [ "$1" ]; then
mkdir -p "$1"
cd "$1" || exit 1
fi
rm -rf libsodium-stable rm -rf libsodium-stable
tar zxf "$file" tar zxf "$dir/$file"
cd libsodium-stable || exit 1 cd libsodium-stable || exit 1
./configure --enable-minimal --disable-dependency-tracking --enable-static --disable-shared ./configure ${1+--host=$1} --enable-minimal --disable-dependency-tracking --enable-static --disable-shared
make -j make -j