Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DNM #157

Closed
wants to merge 4 commits into from
Closed

DNM #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06e1a3d
Use my fork and patch of DuckDB
michaelmdresser Feb 1, 2024
077d482
Fix version var
michaelmdresser Feb 1, 2024
181e706
Increase -j to 8 for linux amd64
michaelmdresser Feb 1, 2024
f2df6ac
make deps.linux.amd64
michaelmdresser Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DUCKDB_VERSION=0.9.2
DUCKDB_VERSION=0.9.2/pick-10268

.PHONY: install
install:
Expand All @@ -17,14 +17,14 @@ FILES := $(wildcard $(SRC_DIR)/*)

.PHONY: deps.header
deps.header:
git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/michaelmdresser/duckdb.git
cp duckdb/src/include/duckdb.h duckdb.h

.PHONY: deps.darwin.amd64
deps.darwin.amd64:
if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi

git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/michaelmdresser/duckdb.git
cd duckdb && \
CFLAGS="-target x86_64-apple-macos11 -O3" CXXFLAGS="-target x86_64-apple-macos11 -O3" BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
mkdir -p lib && \
Expand All @@ -38,7 +38,7 @@ deps.darwin.amd64:
deps.darwin.arm64:
if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "darwin" ]; then echo "Error: must run build on darwin"; false; fi

git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/michaelmdresser/duckdb.git
cd duckdb && \
CFLAGS="-target arm64-apple-macos11 -O3" CXXFLAGS="-target arm64-apple-macos11 -O3" BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
mkdir -p lib && \
Expand All @@ -52,10 +52,10 @@ deps.darwin.arm64:
deps.linux.amd64:
if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi

git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/michaelmdresser/duckdb.git
cd duckdb && \
CFLAGS="-O3" CXXFLAGS="-O3" make -j 2 && \
BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
CFLAGS="-O3" CXXFLAGS="-O3" make -j 8 && \
BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 8 && \
mkdir -p lib && \
for f in `find . -name '*.o'`; do cp $$f lib; done && \
cd lib && \
Expand All @@ -67,7 +67,7 @@ deps.linux.amd64:
deps.linux.arm64:
if [ "$(shell uname -s | tr '[:upper:]' '[:lower:]')" != "linux" ]; then echo "Error: must run build on linux"; false; fi

git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/duckdb/duckdb.git
git clone -b v${DUCKDB_VERSION} --depth 1 https://github.com/michaelmdresser/duckdb.git
cd duckdb && \
CC="aarch64-linux-gnu-gcc" CXX="aarch64-linux-gnu-g++" CFLAGS="-O3" CXXFLAGS="-O3" BUILD_SHELL=0 BUILD_UNITTESTS=0 make -j 2 && \
mkdir -p lib && \
Expand Down
Binary file modified deps/linux_amd64/libduckdb.a
View file
Open in desktop
Binary file not shown.