Skip to content

Commit c0182fd

Browse files
committed
Trying PKGBUILD and windows build script again
1 parent 29b739f commit c0182fd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ci/scripts/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ url="https://arrow.apache.org/"
2626
license=("Apache-2.0")
2727
depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
2828
"${MINGW_PACKAGE_PREFIX}-curl" # for google-cloud-cpp bundled build
29-
"${MINGW_PACKAGE_PREFIX}-libxml2" # for azure
29+
"${MINGW_PACKAGE_PREFIX}-xml2" # for azure
3030
"${MINGW_PACKAGE_PREFIX}-libutf8proc"
3131
"${MINGW_PACKAGE_PREFIX}-re2"
3232
"${MINGW_PACKAGE_PREFIX}-snappy"

ci/scripts/r_windows_build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ if [ -d mingw64/lib/ ]; then
6666
# Move the 64-bit versions of libarrow into the expected location
6767
mv mingw64/lib/*.a $DST_DIR/lib/x64
6868
# These are from https://dl.bintray.com/rtools/mingw{32,64}/
69-
cp $MSYS_LIB_DIR/mingw64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,libxml2}.a $DST_DIR/lib/x64
69+
cp $MSYS_LIB_DIR/mingw64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,xml2}.a $DST_DIR/lib/x64
7070
fi
7171

7272
# Same for the 32-bit versions
7373
if [ -d mingw32/lib/ ]; then
7474
ls $MSYS_LIB_DIR/mingw32/lib/
7575
mkdir -p $DST_DIR/lib/i386
7676
mv mingw32/lib/*.a $DST_DIR/lib/i386
77-
cp $MSYS_LIB_DIR/mingw32/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,libxml2}.a $DST_DIR/lib/i386
77+
cp $MSYS_LIB_DIR/mingw32/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,xml2}.a $DST_DIR/lib/i386
7878
fi
7979

8080
# Do the same also for ucrt64
8181
if [ -d ucrt64/lib/ ]; then
8282
ls $MSYS_LIB_DIR/ucrt64/lib/
8383
mkdir -p $DST_DIR/lib/x64-ucrt
8484
mv ucrt64/lib/*.a $DST_DIR/lib/x64-ucrt
85-
cp $MSYS_LIB_DIR/ucrt64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,libxml2}.a $DST_DIR/lib/x64-ucrt
85+
cp $MSYS_LIB_DIR/ucrt64/lib/lib{snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,nghttp2,xml2}.a $DST_DIR/lib/x64-ucrt
8686
fi
8787

8888
# Create build artifact

0 commit comments

Comments
 (0)