Update build

This commit is contained in:
simon 2019-11-09 17:15:20 -05:00
parent e72fa1587b
commit ba81748a74
8 changed files with 11 additions and 7 deletions

6
.gitmodules vendored
View File

@ -25,3 +25,9 @@
[submodule "lib/harfbuzz"]
path = lib/harfbuzz
url = https://github.com/harfbuzz/harfbuzz
[submodule "lib/libmagic"]
path = lib/libmagic
url = https://github.com/threatstack/libmagic
[submodule "lib/bzip2-1.0.6"]
path = lib/bzip2-1.0.6
url = https://github.com/enthought/bzip2-1.0.6

1
lib/bzip2-1.0.6 Submodule

@ -0,0 +1 @@
Subproject commit 288acf97a15d558f96c24c89f578b724d6e06b0c

@ -1 +1 @@
Subproject commit 0481a1f6e5b8737c4fbc67794fd3a24cfcf34594
Subproject commit 53c21c2d6bebba887be9a30de204875fb41b1169

@ -1 +1 @@
Subproject commit 7cde68f10cdf2c3ff77c1d9077475c0fc034c75c
Subproject commit 878e3588a3349c2660b0f9aa6d94a994034d7c10

1
lib/libmagic Submodule

@ -0,0 +1 @@
Subproject commit 1249b5cd02c3b6fb9b917d16c76bc76c862932b6

@ -1 +1 @@
Subproject commit 91782a434877d84b828fdeef20c569d4c3b4071b
Subproject commit 355cedaefe68358ad533ffb6a59bbb4e6444267a

View File

@ -54,14 +54,12 @@ cd ../..
mv onion/build/src/onion/libonion_static.a .
#bzip2
git clone https://github.com/enthought/bzip2-1.0.6
cd bzip2-1.0.6
make -j 4
cd ..
mv bzip2-1.0.6/libbz2.a .
# magic
git clone https://github.com/threatstack/libmagic
cd libmagic
./autogen.sh
./configure --enable-static --disable-shared

View File

@ -42,14 +42,12 @@ mv ffmpeg/libswresample/libswresample.a .
mv ffmpeg/libswscale/libswscale.a .
#bzip2
git clone https://github.com/enthought/bzip2-1.0.6
cd bzip2-1.0.6
make -j 4
cd ..
mv bzip2-1.0.6/libbz2.a .
# magic
git clone https://github.com/threatstack/libmagic
cd libmagic
./autogen.sh
./configure --enable-static --disable-shared