File tree Expand file tree Collapse file tree 4 files changed +9
-7
lines changed Expand file tree Collapse file tree 4 files changed +9
-7
lines changed Original file line number Diff line number Diff line change 10
10
# benefit from the improvement.
11
11
12
12
set -xeuo pipefail
13
+ export FEEDSTOCK_ROOT=" ${FEEDSTOCK_ROOT:-/ home/ conda/ feedstock_root} "
13
14
14
15
output_dir=${1}
15
16
16
17
export PYTHONUNBUFFERED=1
17
- export FEEDSTOCK_ROOT =" ${FEEDSTOCK_ROOT :-/ home/ conda/ feedstock_root } "
18
+ export RECIPE_ROOT =" ${RECIPE_ROOT :-/ home/ conda/ recipe_root } "
18
19
export CI_SUPPORT=" ${FEEDSTOCK_ROOT} /.ci_support"
19
20
export CONFIG_FILE=" ${CI_SUPPORT} /${CONFIG} .yaml"
20
21
21
22
cat > ~/.condarc << CONDARC
22
23
23
24
conda-build:
24
- root-dir: ${output_dir}
25
+ root-dir: ${output_dir}
25
26
26
27
CONDARC
27
28
28
29
mamba install --update-specs --yes --quiet " conda-forge-ci-setup=3" conda-build pip boa -c conda-forge
29
30
mamba update --update-specs --yes --quiet " conda-forge-ci-setup=3" conda-build pip boa -c conda-forge
30
31
31
32
# set up the condarc
32
- setup_conda_rc " ${FEEDSTOCK_ROOT} " " ${FEEDSTOCK_ROOT } " " ${CONFIG_FILE} "
33
+ setup_conda_rc " ${FEEDSTOCK_ROOT} " " ${RECIPE_ROOT } " " ${CONFIG_FILE} "
33
34
34
35
source run_conda_forge_build_setup
35
36
36
37
# make the build number clobber
37
- make_build_number " ${FEEDSTOCK_ROOT} " " ${FEEDSTOCK_ROOT } " " ${CONFIG_FILE} "
38
+ make_build_number " ${FEEDSTOCK_ROOT} " " ${RECIPE_ROOT } " " ${CONFIG_FILE} "
38
39
39
40
if [[ " ${HOST_PLATFORM} " != " ${BUILD_PLATFORM} " ]] && [[ " ${HOST_PLATFORM} " != linux-* ]] && [[ " ${BUILD_WITH_CONDA_DEBUG:- 0} " != 1 ]]; then
40
41
EXTRA_CB_OPTIONS=" ${EXTRA_CB_OPTIONS:- } --no-test"
Original file line number Diff line number Diff line change @@ -5,13 +5,12 @@ export DISABLE_AUTOBREW=1
5
5
6
6
# arrow uses C++17
7
7
export ARROW_R_CXXFLAGS=" ${ARROW_R_CXXFLAGS} -std=c++17"
8
+ export LIBARROW_BUILD=false
8
9
9
10
if [[ " ${target_platform} " == osx-* ]]; then
10
11
# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
11
12
export ARROW_R_CXXFLAGS=" ${ARROW_R_CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
12
13
fi
13
14
14
- export PKG_CONFIG_PATH=" ${PREFIX} /lib/pkgconfig${PKG_CONFIG_PATH: +: ${PKG_CONFIG_PATH} } "
15
-
16
15
# ${R_ARGS} necessary to support cross-compilation
17
16
${R} CMD INSTALL --build r/. ${R_ARGS}
Original file line number Diff line number Diff line change @@ -16,6 +16,7 @@ build_dir=${1}
16
16
THISDIR=" $( cd " $( dirname " $0 " ) " > /dev/null && pwd ) "
17
17
ARROW_ROOT=$( cd " $THISDIR /../../.." ; pwd ; )
18
18
FEEDSTOCK_ROOT=$THISDIR
19
+ RECIPE_ROOT=$THISDIR
19
20
20
21
docker info
21
22
@@ -64,6 +65,7 @@ docker run ${DOCKER_RUN_ARGS} \
64
65
-v " ${ARROW_ROOT} " :/arrow:rw,z \
65
66
-v " ${build_dir} " :/build:rw \
66
67
-e FEEDSTOCK_ROOT=" /arrow/dev/tasks/conda-recipes" \
68
+ -e RECIPE_ROOT=" /arrow/dev/tasks/conda-recipes" \
67
69
-e CONFIG \
68
70
-e R_CONFIG \
69
71
-e HOST_USER_ID \
Original file line number Diff line number Diff line change 104
104
PKGCONFIG_DIRS=` pkg-config --libs-only-L --silence-errors ${PKG_CONFIG_NAME} `
105
105
fi
106
106
107
- if [ " $PKGCONFIG_CFLAGS " ] && [ " $PKGCONFIG_LIBS " ]; then
107
+ if [ " $PKGCONFIG_LIBS " != " " ]; then
108
108
FOUND_LIB_DIR=` echo $PKGCONFIG_DIRS | sed -e ' s/^-L//' `
109
109
echo " *** Arrow C++ libraries found via pkg-config at $FOUND_LIB_DIR "
110
110
PKG_CFLAGS=" $PKGCONFIG_CFLAGS $PKG_CFLAGS "
You can’t perform that action at this time.
0 commit comments