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 for libarrow 10.0.1 #58

Merged
merged 6 commits into from
Dec 7, 2022
Merged

Rebuild for libarrow 10.0.1 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9ee2d4
build for arrow 10.0.1
h-vetinari Dec 4, 2022
d453742
MNT: Re-rendered with conda-build 3.23.2, conda-smithy 3.22.0, and co…
h-vetinari Dec 4, 2022
8c3167e
sync with upstream; be explicit about -std=c++17
h-vetinari Dec 4, 2022
e70f1fc
re-add ${R_ARGS}
h-vetinari Dec 5, 2022
190c8d3
MNT: Re-rendered with conda-build 3.23.2, conda-smithy 3.22.0, and co…
Dec 5, 2022
fed9e16
sync back changes from https://github.com/apache/arrow/pull/14832
h-vetinari Dec 6, 2022
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
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .ci_support/linux_64_r_base4.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_r_base4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_r_base4.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_r_base4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
Expand Down
15 changes: 0 additions & 15 deletions .ci_support/migrations/r-base42.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
@echo on

bash %RECIPE_DIR%/build_win.sh
IF %ERRORLEVEL% NEQ 0 exit 1

cp %RECIPE_DIR%/configure.win r
IF %ERRORLEVEL% NEQ 0 exit 1

cp %RECIPE_DIR%/install.libs.R r/src
IF %ERRORLEVEL% NEQ 0 exit 1

set "MAKEFLAGS=-j%CPU_COUNT%"
"%R%" CMD INSTALL --build r
IF %ERRORLEVEL% NEQ 0 exit 1
11 changes: 10 additions & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
#!/bin/bash
set -ex

export DISABLE_AUTOBREW=1

# shellcheck disable=SC2086
# arrow uses C++17
export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -std=c++17"

if [[ "${target_platform}" == osx-* ]]; then
# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
fi

# ${R_ARGS} necessary to support cross-compilation
${R} CMD INSTALL --build r/. ${R_ARGS}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is necessary for cross-compilation to work, apparently

5 changes: 2 additions & 3 deletions recipe/configure.win
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

set -euxo pipefail

# Remove the -I../inst/include/ when unvendoring cpp11 in ARROW-13610
echo "PKG_CPPFLAGS=-DNDEBUG -I\"${LIBRARY_PREFIX}/include\" -I\"${PREFIX}/include\" -DARROW_R_WITH_ARROW -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3 -DARROW_R_WITH_JSON -I../inst/include/" > src/Makevars.win
echo "PKG_CPPFLAGS=-DNDEBUG -I\"${LIBRARY_PREFIX}/include\" -I\"${PREFIX}/include\" -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3 -DARROW_R_WITH_JSON" > src/Makevars.win
echo "PKG_CXXFLAGS=\$(CXX_VISIBILITY)" >> src/Makevars.win
echo 'CXX_STD=CXX11' >> src/Makevars.win
echo 'CXX_STD=CXX17' >> src/Makevars.win
echo "PKG_LIBS=-L\"${LIBRARY_PREFIX}/lib\" -larrow_dataset -lparquet -larrow" >> src/Makevars.win
9 changes: 4 additions & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "9.0.0" %}
{% set version = "10.0.1" %}
{% set posix = 'm2-' if win else '' %}
{% set native = 'm2w64-' if win else '' %}

Expand All @@ -8,11 +8,11 @@ package:

source:
url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz
sha256: a9a033f0a3490289998f458680d19579cf07911717ba65afde6cb80070f7a9b5
sha256: c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3

build:
merge_build_host: true # [win]
number: 1
number: 0
rpaths:
- lib/R/lib/
- lib/
Expand All @@ -26,7 +26,6 @@ requirements:
- r-purrr # [build_platform != target_platform]
- r-rlang # [build_platform != target_platform]
- r-tidyselect # [build_platform != target_platform]
- python 3.9 # [build_platform != target_platform]
- {{ compiler('c') }} # [not win]
- {{ compiler('cxx') }} # [not win]
- {{ compiler('r_clang') }} # [win]
Expand All @@ -39,8 +38,8 @@ requirements:
host:
# Needs to be here, otherwise merge_build_host runs into issues
- pkg-config # [win]
- libarrow {{ version }}
- r-base
- arrow-cpp {{ version }}
- r-r6
- r-cpp11
- r-assertthat
Expand Down