diff --git a/linux/bin/protoc b/linux/bin/protoc index 4529eec81..c07dbe1c7 100755 Binary files a/linux/bin/protoc and b/linux/bin/protoc differ diff --git a/linux/bin/sqlite3 b/linux/bin/sqlite3 index f29921532..530752b05 100755 Binary files a/linux/bin/sqlite3 and b/linux/bin/sqlite3 differ diff --git a/linux/include/sqlite/sqlite3.h b/linux/include/sqlite/sqlite3.h index f3cf3b464..2ed7c272f 100644 --- a/linux/include/sqlite/sqlite3.h +++ b/linux/include/sqlite/sqlite3.h @@ -123,7 +123,7 @@ extern "C" { */ #define SQLITE_VERSION "3.20.0" #define SQLITE_VERSION_NUMBER 3020000 -#define SQLITE_SOURCE_ID "2017-08-08 23:33:01 a80452fd36181666ad43237d451a5b14ba993d89" +#define SQLITE_SOURCE_ID "2018-06-20 11:41:36 fb90639441b6e5377d5ba8318d17ee85149f829d" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/linux/include/uuid/uuid.h b/linux/include/uuid/uuid.h new file mode 100644 index 000000000..03c232caa --- /dev/null +++ b/linux/include/uuid/uuid.h @@ -0,0 +1,121 @@ +/* + * Public include file for the UUID library + * + * Copyright (C) 1996, 1997, 1998 Theodore Ts'o. + * + * %Begin-Header% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, and the entire permission notice in its entirety, + * including the disclaimer of warranties. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF + * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * %End-Header% + */ + +#ifndef _UUID_UUID_H +#define _UUID_UUID_H + +#include +#ifndef _WIN32 +#include +#endif +#include + +typedef unsigned char uuid_t[16]; + +/* UUID Variant definitions */ +#define UUID_VARIANT_NCS 0 +#define UUID_VARIANT_DCE 1 +#define UUID_VARIANT_MICROSOFT 2 +#define UUID_VARIANT_OTHER 3 + +#define UUID_VARIANT_SHIFT 5 +#define UUID_VARIANT_MASK 0x7 + +/* UUID Type definitions */ +#define UUID_TYPE_DCE_TIME 1 +#define UUID_TYPE_DCE_SECURITY 2 +#define UUID_TYPE_DCE_MD5 3 +#define UUID_TYPE_DCE_RANDOM 4 +#define UUID_TYPE_DCE_SHA1 5 + +#define UUID_TYPE_SHIFT 4 +#define UUID_TYPE_MASK 0xf + +#define UUID_STR_LEN 37 + +/* Allow UUID constants to be defined */ +#ifdef __GNUC__ +#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ + static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} +#else +#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ + static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* clear.c */ +extern void uuid_clear(uuid_t uu); + +/* compare.c */ +extern int uuid_compare(const uuid_t uu1, const uuid_t uu2); + +/* copy.c */ +extern void uuid_copy(uuid_t dst, const uuid_t src); + +/* gen_uuid.c */ +extern void uuid_generate(uuid_t out); +extern void uuid_generate_random(uuid_t out); +extern void uuid_generate_time(uuid_t out); +extern int uuid_generate_time_safe(uuid_t out); + +extern void uuid_generate_md5(uuid_t out, const uuid_t ns, const char *name, size_t len); +extern void uuid_generate_sha1(uuid_t out, const uuid_t ns, const char *name, size_t len); + +/* isnull.c */ +extern int uuid_is_null(const uuid_t uu); + +/* parse.c */ +extern int uuid_parse(const char *in, uuid_t uu); + +/* unparse.c */ +extern void uuid_unparse(const uuid_t uu, char *out); +extern void uuid_unparse_lower(const uuid_t uu, char *out); +extern void uuid_unparse_upper(const uuid_t uu, char *out); + +/* uuid_time.c */ +extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); +extern int uuid_type(const uuid_t uu); +extern int uuid_variant(const uuid_t uu); + +/* predefined.c */ +extern const uuid_t *uuid_get_template(const char *alias); + +#ifdef __cplusplus +} +#endif + +#endif /* _UUID_UUID_H */ diff --git a/linux/lib/Debug/libbenchmark.a b/linux/lib/Debug/libbenchmark.a index 3942ca301..bfce76f06 100644 Binary files a/linux/lib/Debug/libbenchmark.a and b/linux/lib/Debug/libbenchmark.a differ diff --git a/linux/lib/Debug/libboost_atomic.a b/linux/lib/Debug/libboost_atomic.a index 430c65d6f..991468bc1 100644 Binary files a/linux/lib/Debug/libboost_atomic.a and b/linux/lib/Debug/libboost_atomic.a differ diff --git a/linux/lib/Debug/libboost_chrono.a b/linux/lib/Debug/libboost_chrono.a index f1049e135..282281725 100644 Binary files a/linux/lib/Debug/libboost_chrono.a and b/linux/lib/Debug/libboost_chrono.a differ diff --git a/linux/lib/Debug/libboost_date_time.a b/linux/lib/Debug/libboost_date_time.a index 17b157798..7d38d1ad1 100644 Binary files a/linux/lib/Debug/libboost_date_time.a and b/linux/lib/Debug/libboost_date_time.a differ diff --git a/linux/lib/Debug/libboost_filesystem.a b/linux/lib/Debug/libboost_filesystem.a index dbd570c8a..f25a3a69a 100644 Binary files a/linux/lib/Debug/libboost_filesystem.a and b/linux/lib/Debug/libboost_filesystem.a differ diff --git a/linux/lib/Debug/libboost_regex.a b/linux/lib/Debug/libboost_regex.a index 085f8b7f3..dd79b1e42 100644 Binary files a/linux/lib/Debug/libboost_regex.a and b/linux/lib/Debug/libboost_regex.a differ diff --git a/linux/lib/Debug/libboost_system.a b/linux/lib/Debug/libboost_system.a index 9320a7f9b..e2aa5a3ed 100644 Binary files a/linux/lib/Debug/libboost_system.a and b/linux/lib/Debug/libboost_system.a differ diff --git a/linux/lib/Debug/libboost_thread.a b/linux/lib/Debug/libboost_thread.a index 2368b214d..e37fc5547 100644 Binary files a/linux/lib/Debug/libboost_thread.a and b/linux/lib/Debug/libboost_thread.a differ diff --git a/linux/lib/Debug/libcrypto.a b/linux/lib/Debug/libcrypto.a index ee462b54b..2a78e0bd4 100644 Binary files a/linux/lib/Debug/libcrypto.a and b/linux/lib/Debug/libcrypto.a differ diff --git a/linux/lib/Debug/libcurl.a b/linux/lib/Debug/libcurl.a index 86a5eeea3..00d619d77 100644 Binary files a/linux/lib/Debug/libcurl.a and b/linux/lib/Debug/libcurl.a differ diff --git a/linux/lib/Debug/libfmt.a b/linux/lib/Debug/libfmt.a index 6caad7c97..ee52c56b9 100644 Binary files a/linux/lib/Debug/libfmt.a and b/linux/lib/Debug/libfmt.a differ diff --git a/linux/lib/Debug/libprotobuf.a b/linux/lib/Debug/libprotobuf.a index b34dd3dc9..772559dad 100644 Binary files a/linux/lib/Debug/libprotobuf.a and b/linux/lib/Debug/libprotobuf.a differ diff --git a/linux/lib/Debug/libprotoc.a b/linux/lib/Debug/libprotoc.a index 565cae8e9..15c14001d 100644 Binary files a/linux/lib/Debug/libprotoc.a and b/linux/lib/Debug/libprotoc.a differ diff --git a/linux/lib/Debug/libpugixml.a b/linux/lib/Debug/libpugixml.a index 0c869f53c..ba46c4930 100644 Binary files a/linux/lib/Debug/libpugixml.a and b/linux/lib/Debug/libpugixml.a differ diff --git a/linux/lib/Debug/libquickfix.a b/linux/lib/Debug/libquickfix.a index 93ff0fdad..a64bf50a8 100644 Binary files a/linux/lib/Debug/libquickfix.a and b/linux/lib/Debug/libquickfix.a differ diff --git a/linux/lib/Debug/libsqlite3.a b/linux/lib/Debug/libsqlite3.a index f7d926306..b17ec3158 100644 Binary files a/linux/lib/Debug/libsqlite3.a and b/linux/lib/Debug/libsqlite3.a differ diff --git a/linux/lib/Debug/libssl.a b/linux/lib/Debug/libssl.a index 3abace99b..9ae9f1aa9 100644 Binary files a/linux/lib/Debug/libssl.a and b/linux/lib/Debug/libssl.a differ diff --git a/linux/lib/Debug/libuuid.a b/linux/lib/Debug/libuuid.a new file mode 100644 index 000000000..3e8a8750d Binary files /dev/null and b/linux/lib/Debug/libuuid.a differ diff --git a/linux/lib/Release/libbenchmark.a b/linux/lib/Release/libbenchmark.a index 59bda7e55..0afbe05dd 100644 Binary files a/linux/lib/Release/libbenchmark.a and b/linux/lib/Release/libbenchmark.a differ diff --git a/linux/lib/Release/libboost_atomic.a b/linux/lib/Release/libboost_atomic.a index 06d502cba..f1aa055c2 100644 Binary files a/linux/lib/Release/libboost_atomic.a and b/linux/lib/Release/libboost_atomic.a differ diff --git a/linux/lib/Release/libboost_chrono.a b/linux/lib/Release/libboost_chrono.a index 0d32009d6..381724895 100644 Binary files a/linux/lib/Release/libboost_chrono.a and b/linux/lib/Release/libboost_chrono.a differ diff --git a/linux/lib/Release/libboost_date_time.a b/linux/lib/Release/libboost_date_time.a index 258c64627..727a06864 100644 Binary files a/linux/lib/Release/libboost_date_time.a and b/linux/lib/Release/libboost_date_time.a differ diff --git a/linux/lib/Release/libboost_filesystem.a b/linux/lib/Release/libboost_filesystem.a index 156150c3c..52ff7b851 100644 Binary files a/linux/lib/Release/libboost_filesystem.a and b/linux/lib/Release/libboost_filesystem.a differ diff --git a/linux/lib/Release/libboost_regex.a b/linux/lib/Release/libboost_regex.a index b429db392..44a5b4aa7 100644 Binary files a/linux/lib/Release/libboost_regex.a and b/linux/lib/Release/libboost_regex.a differ diff --git a/linux/lib/Release/libboost_system.a b/linux/lib/Release/libboost_system.a index c6e5a77ee..f69d37b9b 100644 Binary files a/linux/lib/Release/libboost_system.a and b/linux/lib/Release/libboost_system.a differ diff --git a/linux/lib/Release/libboost_thread.a b/linux/lib/Release/libboost_thread.a index 1f3e20b6d..a044bb94a 100644 Binary files a/linux/lib/Release/libboost_thread.a and b/linux/lib/Release/libboost_thread.a differ diff --git a/linux/lib/Release/libcrypto.a b/linux/lib/Release/libcrypto.a index 24a35a9e7..bbd4f3594 100644 Binary files a/linux/lib/Release/libcrypto.a and b/linux/lib/Release/libcrypto.a differ diff --git a/linux/lib/Release/libcurl.a b/linux/lib/Release/libcurl.a index f84d0832f..5c2884781 100644 Binary files a/linux/lib/Release/libcurl.a and b/linux/lib/Release/libcurl.a differ diff --git a/linux/lib/Release/libfmt.a b/linux/lib/Release/libfmt.a index 7220593a8..69c6d4164 100644 Binary files a/linux/lib/Release/libfmt.a and b/linux/lib/Release/libfmt.a differ diff --git a/linux/lib/Release/libprotobuf.a b/linux/lib/Release/libprotobuf.a index e7156c249..11611deff 100644 Binary files a/linux/lib/Release/libprotobuf.a and b/linux/lib/Release/libprotobuf.a differ diff --git a/linux/lib/Release/libprotoc.a b/linux/lib/Release/libprotoc.a index f7b762ade..bbcfed818 100644 Binary files a/linux/lib/Release/libprotoc.a and b/linux/lib/Release/libprotoc.a differ diff --git a/linux/lib/Release/libpugixml.a b/linux/lib/Release/libpugixml.a index 47c25cef0..6371f896a 100644 Binary files a/linux/lib/Release/libpugixml.a and b/linux/lib/Release/libpugixml.a differ diff --git a/linux/lib/Release/libquickfix.a b/linux/lib/Release/libquickfix.a index 93ff0fdad..a64bf50a8 100644 Binary files a/linux/lib/Release/libquickfix.a and b/linux/lib/Release/libquickfix.a differ diff --git a/linux/lib/Release/libsqlite3.a b/linux/lib/Release/libsqlite3.a index f7d926306..b17ec3158 100644 Binary files a/linux/lib/Release/libsqlite3.a and b/linux/lib/Release/libsqlite3.a differ diff --git a/linux/lib/Release/libssl.a b/linux/lib/Release/libssl.a index ecdb64aa9..9a34c4397 100644 Binary files a/linux/lib/Release/libssl.a and b/linux/lib/Release/libssl.a differ diff --git a/linux/lib/Release/libuuid.a b/linux/lib/Release/libuuid.a new file mode 100644 index 000000000..3e8a8750d Binary files /dev/null and b/linux/lib/Release/libuuid.a differ diff --git a/src/benchmark/build_benchmark.sh b/src/benchmark/build_benchmark.sh index 1ea0dc877..e0b98ca46 100755 --- a/src/benchmark/build_benchmark.sh +++ b/src/benchmark/build_benchmark.sh @@ -21,7 +21,7 @@ cp -R $work/$benchmark/include/benchmark $target/include cd $work/$benchmark mkdir debug_build cd debug_build -cmake -DCMAKE_BUILD_TYPE=Debug .. +cmake -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true -DCMAKE_BUILD_TYPE=Debug .. make -j $(nproc) cp src/libbenchmark.a $target/lib/Debug/ @@ -29,7 +29,7 @@ cp src/libbenchmark.a $target/lib/Debug/ cd $work/$benchmark mkdir release_build cd release_build -cmake -DCMAKE_BUILD_TYPE=Release .. +cmake -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true -DCMAKE_BUILD_TYPE=Release .. make -j $(nproc) cp src/libbenchmark.a $target/lib/Release/ diff --git a/src/boost/build_boost.sh b/src/boost/build_boost.sh index 43f6b99f7..5109a08f7 100755 --- a/src/boost/build_boost.sh +++ b/src/boost/build_boost.sh @@ -24,6 +24,7 @@ cp -R boost $target/include/ # build release ./b2 stage -a -j24 --layout=system link=static threading=multi variant=release \ + cxxflags=-fPIC \ address-model=64 -debug-symbols=on \ --with-system \ --with-thread \ @@ -39,6 +40,7 @@ rm -rf stage # build debug ./b2 stage -a -j24 --layout=system link=static threading=multi variant=debug \ address-model=64 -debug-symbols=on \ + cxxflags=-fPIC \ --with-system \ --with-thread \ --with-filesystem \ diff --git a/src/curl/build_curl.sh b/src/curl/build_curl.sh index b488a5809..e84a4523d 100755 --- a/src/curl/build_curl.sh +++ b/src/curl/build_curl.sh @@ -38,7 +38,7 @@ unzip -q -o $src/curl/$curl -d $work cd $work/$curl ./buildconf LIBS="-ldl -lpthread" \ -CPPFLAGS="-I${ssl_include}" \ +CPPFLAGS="-fPIC -I${ssl_include}" \ LDFLAGS="-L${ssl_debug}/lib -Xlinker -rpath=${ssl_debug}/lib" \ ./configure \ --disable-shared \ @@ -63,6 +63,7 @@ LDFLAGS="-L${ssl_debug}/lib -Xlinker -rpath=${ssl_debug}/lib" \ --disable-ftps \ --disable-gopher \ --without-librtmp \ + --without-libidn2 \ --without-zlib \ --enable-debug \ --disable-curldebug \ @@ -83,7 +84,7 @@ unzip -q -o $src/curl/$curl -d $work cd $work/$curl ./buildconf LIBS="-ldl -lpthread" \ -CPPFLAGS="-I${ssl_include}" \ +CPPFLAGS="-fPIC -I${ssl_include}" \ LDFLAGS="-L${ssl_release} -Xlinker -rpath=${ssl_release}" \ ./configure --disable-shared \ --enable-static \ @@ -107,6 +108,7 @@ LDFLAGS="-L${ssl_release} -Xlinker -rpath=${ssl_release}" \ --disable-ftps \ --disable-gopher \ --without-librtmp \ + --without-libidn2 \ --without-zlib \ --disable-crypto-auth \ --with-ssl="$ssl_release" \ diff --git a/src/fmt/build_fmt.sh b/src/fmt/build_fmt.sh index 5af49a98e..7189e36af 100755 --- a/src/fmt/build_fmt.sh +++ b/src/fmt/build_fmt.sh @@ -21,7 +21,7 @@ cp -R $work/$fmt/fmt $target/include cd $work/$fmt mkdir debug_build cd debug_build -cmake -DFMT_TEST=no -DFMT_INSTALL=no -DCMAKE_BUILD_TYPE=Debug .. +cmake -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true --DFMT_TEST=no -DFMT_INSTALL=no -DCMAKE_BUILD_TYPE=Debug .. make -j $(nproc) cp fmt/libfmt.a $target/lib/Debug/ @@ -29,7 +29,7 @@ cp fmt/libfmt.a $target/lib/Debug/ cd $work/$fmt mkdir release_build cd release_build -cmake -DFMT_TEST=no -DFMT_INSTALL=no -DCMAKE_BUILD_TYPE=Release .. +cmake -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true -DFMT_TEST=no -DFMT_INSTALL=no -DCMAKE_BUILD_TYPE=Release .. make -j $(nproc) cp fmt/libfmt.a $target/lib/Release/ diff --git a/src/openssl/build_openssl.sh b/src/openssl/build_openssl.sh index 6d3741bb3..8d8ded412 100755 --- a/src/openssl/build_openssl.sh +++ b/src/openssl/build_openssl.sh @@ -15,7 +15,7 @@ rm -rf $target/include/openssl unzip -q $src/openssl/$openssl -d $work cd $work/$openssl -./config -d --prefix=$work/$openssl/debug_build --openssldir=/$work/$openssl/debug_build -ldl no-shared +./config -d --prefix=$work/$openssl/debug_build --openssldir=/$work/$openssl/debug_build -fPIC -ldl no-shared make -j$(nproc) make install cp -R ./libcrypto.a $target/lib/Debug/ @@ -26,7 +26,7 @@ cp -R ./libssl.a $target/lib/Debug/ #unzip -q -o $src/openssl/$openssl -d $work cd $work/$openssl -./config --prefix=$work/$openssl/release_build --openssldir=/$work/$openssl/debug_build -ldl no-shared +./config --prefix=$work/$openssl/release_build --openssldir=/$work/$openssl/release_build -fPIC -ldl no-shared make -j$(nproc) make install cp -R ./include/openssl $target/include diff --git a/src/protobuf/build_protobuf.sh b/src/protobuf/build_protobuf.sh index 01dcc220e..7e7f8bf86 100755 --- a/src/protobuf/build_protobuf.sh +++ b/src/protobuf/build_protobuf.sh @@ -25,7 +25,7 @@ cp -R $work/$protobuf/src/google $target/include/ cd $work/$protobuf mkdir release cd release -cmake -DCMAKE_BUILD_TYPE=Release -Dprotobuf_BUILD_TESTS=OFF $work/$protobuf/cmake +cmake -DCMAKE_BUILD_TYPE=Release -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true $work/$protobuf/cmake make -j $(nproc) cp protoc $target/bin/ cp libprotobuf.a $target/lib/Release @@ -35,7 +35,7 @@ cp libprotoc.a $target/lib/Release cd $work/$protobuf mkdir debug cd debug -cmake -DCMAKE_BUILD_TYPE=Debug -Dprotobuf_BUILD_TESTS=OFF $work/$protobuf/cmake +cmake -DCMAKE_BUILD_TYPE=Debug -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true $work/$protobuf/cmake make -j $(nproc) cp libprotobufd.a $target/lib/Debug/libprotobuf.a cp libprotocd.a $target/lib/Debug/libprotoc.a @@ -48,5 +48,3 @@ python setup.py build mkdir -p $target/python/ cp -R google $target/python/google -rm -rf $work - diff --git a/src/pugixml/build_pugixml.sh b/src/pugixml/build_pugixml.sh index 0876e1ea7..b56106920 100755 --- a/src/pugixml/build_pugixml.sh +++ b/src/pugixml/build_pugixml.sh @@ -24,7 +24,7 @@ cp -R $work/$pugi/src/* $target/include/pugixml/ cd $work/$pugi mkdir debug_build cd debug_build -cmake -DCMAKE_BUILD_TYPE=Debug .. +cmake -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true -DCMAKE_BUILD_TYPE=Debug .. make -j $(nproc) cp libpugixml.a $target/lib/Debug/ @@ -32,7 +32,7 @@ cp libpugixml.a $target/lib/Debug/ cd $work/$pugi mkdir release_build cd release_build -cmake -DCMAKE_BUILD_TYPE=Release .. +cmake -DCMAKE_POSITION_INDEPENDENT_CODE:bool=true -DCMAKE_BUILD_TYPE=Release .. make -j $(nproc) cp libpugixml.a $target/lib/Release/ diff --git a/src/quickfix/build_quickfix.sh b/src/quickfix/build_quickfix.sh index f1b1f10d4..e2e672abb 100755 --- a/src/quickfix/build_quickfix.sh +++ b/src/quickfix/build_quickfix.sh @@ -18,7 +18,7 @@ unzip -q $src/quickfix/$quickfix -d $work cd $work/$quickfix /bin/bash ./bootstrap -/bin/bash ./configure --enable-shared=no --enable-static=yes +/bin/bash ./configure --enable-shared=no --enable-static=yes make -j $(nproc) @@ -26,4 +26,3 @@ cp -R include/quickfix $target/include cp lib/libquickfix.a $target/lib/Debug/ cp lib/libquickfix.a $target/lib/Release/ -rm -Rf $work diff --git a/src/sqlite/build_sqlite.sh b/src/sqlite/build_sqlite.sh index 77ba4a13e..aa007fb7f 100755 --- a/src/sqlite/build_sqlite.sh +++ b/src/sqlite/build_sqlite.sh @@ -25,8 +25,8 @@ echo $(git log -1 --format=format:%H) > manifest.uuid mkdir build cd build -../configure -make -j $(nproc) +../configure +make CFLAGS=-fPIC -j $(nproc) make -j $(nproc) sqlite3.c mkdir -p $target/include/sqlite @@ -36,6 +36,5 @@ cp .libs/libsqlite3.a $target/lib/Debug/ cp .libs/libsqlite3.a $target/lib/Release/ -rm -rf $work diff --git a/src/uuid/build_uuid.sh b/src/uuid/build_uuid.sh new file mode 100755 index 000000000..004b86656 --- /dev/null +++ b/src/uuid/build_uuid.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +uuid="util-linux-2.32" +root=`realpath ../..` +work=$root/work +src=$root/src +target=$root/linux + +if [ -d "$work" ]; then rm -Rf $work; fi +mkdir $work + +rm -f $target/lib/Debug/libuuid* +rm -f $target/lib/Release/libuuid* +rm -rf $target/include/uuid + +unzip -q $src/uuid/$uuid -d $work + +cd $work/$uuid +./autogen.sh +./configure --enable-shared=no --enable-static=yes CFLAGS=-fPIC --disable-all-programs --enable-libuuid +make -j $(nproc) +cp .libs/libuuid.a $target/lib/Debug/ +cp .libs/libuuid.a $target/lib/Release/ +mkdir $target/include/uuid +cp libuuid/src/uuid.h $target/include/uuid + diff --git a/src/uuid/util-linux-2.32.zip b/src/uuid/util-linux-2.32.zip new file mode 100644 index 000000000..9020ecc0f Binary files /dev/null and b/src/uuid/util-linux-2.32.zip differ