Skip to content

Commit 45e5a92

Browse files
authored
Merge pull request #133 from lnkuiper/jemalloc
Bundle jemalloc
2 parents 84b44cd + 2be02c1 commit 45e5a92

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

.github/workflows/Java.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020
fetch-depth: 0
2121
ref: ${{ inputs.git_ref }}
2222

23-
- run: make format-check
23+
- run: |
24+
python3 -m pip install --user clang_format==11.0.1
25+
make format-check
2426
2527
java-linux-amd64:
2628
name: Java Linux (amd64)

vendor.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import sys
33
import json
44
import pickle
5+
import platform
56
import argparse
67

78
parser = argparse.ArgumentParser(description='Inlines DuckDB Sources')
@@ -17,6 +18,15 @@
1718
# list of extensions to bundle
1819
extensions = ['core_functions', 'parquet', 'icu', 'json']
1920

21+
# Conditionally include jemalloc
22+
is_android = hasattr(sys, 'getandroidapilevel')
23+
is_pyodide = 'PYODIDE' in os.environ
24+
use_jemalloc = (
25+
not is_android and not is_pyodide and platform.system() == 'Linux' and platform.architecture()[0] == '64bit'
26+
)
27+
if use_jemalloc:
28+
extensions.append('jemalloc')
29+
2030
# path to target
2131
basedir = os.getcwd()
2232
target_dir = os.path.join(basedir, 'src', 'duckdb')

0 commit comments

Comments
 (0)