diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml index 0663553..d495502 100644 --- a/.github/workflows/_extension_distribution.yml +++ b/.github/workflows/_extension_distribution.yml @@ -331,7 +331,7 @@ jobs: - name: Install Ninja run: | - brew install ninja + brew install ninja autoconf make libtool pkg-config automake autoconf-archive - name: Setup Ccache uses: hendrikmuhs/ccache-action@main diff --git a/docker/linux_amd64/Dockerfile b/docker/linux_amd64/Dockerfile index ab0a0f2..b26330a 100644 --- a/docker/linux_amd64/Dockerfile +++ b/docker/linux_amd64/Dockerfile @@ -7,7 +7,7 @@ FROM ubuntu:18.04 # Setup the basic necessities RUN apt-get update -y -qq RUN apt-get install -y -qq software-properties-common -RUN apt-get install -y -qq --fix-missing ninja-build make gcc-multilib g++-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client pkg-config +RUN apt-get install -y -qq --fix-missing ninja-build make gcc-multilib g++-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client pkg-config autoconf RUN apt-get install -y -qq ccache # Install cmake 3.21 diff --git a/docker/linux_amd64_gcc4/Dockerfile b/docker/linux_amd64_gcc4/Dockerfile index 231d06a..1b7f8d6 100644 --- a/docker/linux_amd64_gcc4/Dockerfile +++ b/docker/linux_amd64_gcc4/Dockerfile @@ -10,7 +10,7 @@ RUN yum install -y gcc-c++ RUN yum install -y nodejs # Setup the basic necessities -RUN yum install -y curl zip unzip tar +RUN yum install -y curl zip unzip tar autoconf RUN yum install -y ninja-build RUN yum install -y perl-IPC-Cmd RUN yum install -y ccache diff --git a/docker/linux_arm64/Dockerfile b/docker/linux_arm64/Dockerfile index 8dd9147..7fc6031 100644 --- a/docker/linux_arm64/Dockerfile +++ b/docker/linux_arm64/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:18.04 RUN apt-get update -y -qq RUN apt-get install -y -qq software-properties-common RUN apt-get install -y -qq --fix-missing ninja-build make gcc-multilib g++-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client pkg-config -RUN apt-get install -y -qq ccache +RUN apt-get install -y -qq ccache autoconf # Setup cross compiler because GH actions does not have open source arm runners yet RUN apt-get install -y -qq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu diff --git a/makefiles/duckdb_extension.Makefile b/makefiles/duckdb_extension.Makefile index 6f01766..84a36df 100644 --- a/makefiles/duckdb_extension.Makefile +++ b/makefiles/duckdb_extension.Makefile @@ -89,7 +89,7 @@ test_reldebug: reldebug # WASM config VCPKG_EMSDK_FLAGS=-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$(EMSDK)/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -WASM_COMPILE_TIME_COMMON_FLAGS=-DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 -DSKIP_EXTENSIONS="parquet;json" $(TOOLCHAIN_FLAGS) $(VCPKG_EMSDK_FLAGS) +WASM_COMPILE_TIME_COMMON_FLAGS=-DWASM_LOADABLE_EXTENSIONS=1 -DBUILD_EXTENSIONS_ONLY=1 $(TOOLCHAIN_FLAGS) $(VCPKG_EMSDK_FLAGS) WASM_CXX_MVP_FLAGS= WASM_CXX_EH_FLAGS=$(WASM_CXX_MVP_FLAGS) -fwasm-exceptions -DWEBDB_FAST_EXCEPTIONS=1 WASM_CXX_THREADS_FLAGS=$(WASM_COMPILE_TIME_EH_FLAGS) -DWITH_WASM_THREADS=1 -DWITH_WASM_SIMD=1 -DWITH_WASM_BULK_MEMORY=1 -pthread