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

Rebuild k8 on macOS #52560

Merged
merged 13 commits into from
Dec 17, 2024
Merged

Rebuild k8 on macOS #52560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
992d4e3
Rebuild k8 on macOS
mencian Dec 3, 2024
0ff5ea5
Update nodejs-x86_64.patch
mencian Dec 3, 2024
c1c6a26
Update build.sh
mencian Dec 3, 2024
a1758ac
Update conda_build_config.yaml
mencian Dec 4, 2024
246c548
Update conda_build_config.yaml
mencian Dec 4, 2024
91c80f2
Update build.sh
mencian Dec 4, 2024
2009661
Update meta.yaml
mencian Dec 4, 2024
d9d54f1
Update meta.yaml
mencian Dec 4, 2024
eaa62c7
Update build.sh
mencian Dec 4, 2024
7053da2
Update build.sh
mencian Dec 4, 2024
67f22a0
bump build number
mencian Dec 17, 2024
a093f99
add -fno-define-target-os-macros
mencian Dec 17, 2024
1f76870
Merge branch 'master' into k8
mencian Dec 17, 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
10 changes: 5 additions & 5 deletions recipes/k8/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ DEFAULT_LINUX_VERSION="cos7"
# * node-18.20.x can be compiled on MacOS but not on CentOS 7 because it
# includes an updated c-ares library which is incompatible with glibc on CentOS 7
if [[ "$(uname)" == "Darwin" ]]; then
NODE_VERSION="18.20.4"
NODE_VERSION="18.20.5"
export LDFLAGS="${LDFLAGS} -Wl,-rpath,${PREFIX}/lib"
export CFLAGS="${CFLAGS} -fno-define-target-os-macros"
else
NODE_VERSION="18.19.1"
fi
Expand Down Expand Up @@ -47,8 +48,7 @@ sed -i.bak 's/LIBS=/LIBS?=/' Makefile
rm -rf *.bak

# Then compile k8
NODE_SRC="node-v${NODE_VERSION}" CXXFLAGS="${CXXFLAGS} -std=c++17 -g -O3 -Wall" LIBS="${LDFLAGS} -pthread" make
NODE_SRC="node-v${NODE_VERSION}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -std=c++17 -g -O3 -Wall" LIBS="${LDFLAGS} -pthread" make -j"${CPU_COUNT}"

mkdir -p $PREFIX/bin
chmod 0755 k8
cp -f k8 $PREFIX/bin/
install -d "${PREFIX}/bin"
install -v -m 0755 k8 "${PREFIX}/bin"
2 changes: 1 addition & 1 deletion recipes/k8/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
c_stdlib_version: # [unix]
- 2.17 # [linux and x86_64]
- 2.17 # [linux and not x86_64]
- 2.17 # [linux and not x86_64]
4 changes: 2 additions & 2 deletions recipes/k8/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ source:
sha256: 4157aa86066eb0a7874de194893c4544ac772d009cc1148377c9c346f9fc6d07

build:
number: 3
skip: True # [osx and x86_64]
number: 5
run_exports:
- {{ pin_subpackage('k8', max_pin="x") }}

requirements:
build:
- {{ compiler('cxx') }}
- make
- clangdev # [osx]
- sysroot_linux-64 >=2.17 # [linux and x86_64]
host:
- python >=3.8
Expand Down