From 1f43ab3bccb20e3df137067ffa3aa78b8a179ac9 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 3 Aug 2024 10:28:17 -0500 Subject: [PATCH] updated build system --- docker/aarch64/alpine | 1 + docker/x86_64/alpine | 1 + docker/x86_64/mingw64 | 2 +- support/3rd_party/sqlite_configure.sh | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/aarch64/alpine b/docker/aarch64/alpine index 29f4c9ff..77103cec 100644 --- a/docker/aarch64/alpine +++ b/docker/aarch64/alpine @@ -66,6 +66,7 @@ RUN apk add \ pkgconfig \ rsync \ tcl \ + tcl-dev \ texinfo \ vlc-dev \ wget \ diff --git a/docker/x86_64/alpine b/docker/x86_64/alpine index 3ad96a3a..3baa1759 100644 --- a/docker/x86_64/alpine +++ b/docker/x86_64/alpine @@ -65,6 +65,7 @@ RUN apk add \ pkgconfig \ rsync \ tcl \ + tcl-dev \ texinfo \ wget \ xz \ diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index f149cd32..00f26f6b 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -41,6 +41,7 @@ RUN apk add \ rsync \ ruby \ tcl \ + tcl-dev \ texinfo \ unzip \ wget \ @@ -949,7 +950,6 @@ RUN if [ -f "/3rd_party/sqlite-${MY_SQLITE_VERSION2}.tar.gz" ]; then \ tar xvzf /3rd_party/sqlite-${MY_SQLITE_VERSION2}.tar.gz \ && cd sqlite-version-${MY_SQLITE_VERSION2} \ && CFLAGS="-O3 -m64 -mtune=generic" ./configure \ - --disable-amalgamation \ --disable-tcl \ --enable-shared \ --enable-static \ diff --git a/support/3rd_party/sqlite_configure.sh b/support/3rd_party/sqlite_configure.sh index c15a8e80..cdcf52e7 100755 --- a/support/3rd_party/sqlite_configure.sh +++ b/support/3rd_party/sqlite_configure.sh @@ -5,7 +5,6 @@ if [ "$1" == "mingw64" ]; then fi CFLAGS="-O3 -march=$2 -mtune=generic" ./configure \ - --disable-amalgamation \ --disable-tcl \ --enable-shared=yes \ --enable-static=yes \