[arrow] branch master updated: GH-15110: [R] [CI] Windows build fails in packaging job (#15111)

[assignuser]

This is an automated email from the ASF dual-hosted git repository.

assignuser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 7317ff105d GH-15110: [R] [CI] Windows build fails in packaging job 
(#15111)
7317ff105d is described below

commit 7317ff105d58258fe495e079c3ff9e8eeef6279a
Author: Jonathan Keane <jke...@gmail.com>
AuthorDate: Thu Dec 29 12:26:22 2022 -0600

    GH-15110: [R] [CI] Windows build fails in packaging job (#15111)
    
    Add new dependencies to windows builds following #14235
    * Closes: #15110
    
    Authored-by: Jonathan Keane <jke...@gmail.com>
    Signed-off-by: Jacob Wujciak-Jens <ja...@wujciak.de>
---
 ci/scripts/r_windows_build.sh | 6 +++---
 r/configure.win               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/scripts/r_windows_build.sh b/ci/scripts/r_windows_build.sh
index 6b6a5dd0c9..c9395eb243 100755
--- a/ci/scripts/r_windows_build.sh
+++ b/ci/scripts/r_windows_build.sh
@@ -71,7 +71,7 @@ if [ -d mingw64/lib/ ]; then
   # Move the 64-bit versions of libarrow into the expected location
   mv mingw64/lib/*.a $DST_DIR/lib/x64
   # These are from https://dl.bintray.com/rtools/mingw{32,64}/
-  cp 
$MSYS_LIB_DIR/mingw64/lib/lib{thrift,snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,aws*}.a
 $DST_DIR/lib/x64
+  cp 
$MSYS_LIB_DIR/mingw64/lib/lib{thrift,snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,aws*,nghttp2}.a
 $DST_DIR/lib/x64
 fi
 
 # Same for the 32-bit versions
@@ -79,7 +79,7 @@ if [ -d mingw32/lib/ ]; then
   ls $MSYS_LIB_DIR/mingw32/lib/
   mkdir -p $DST_DIR/lib/i386
   mv mingw32/lib/*.a $DST_DIR/lib/i386
-  cp 
$MSYS_LIB_DIR/mingw32/lib/lib{thrift,snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,aws*}.a
 $DST_DIR/lib/i386
+  cp 
$MSYS_LIB_DIR/mingw32/lib/lib{thrift,snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,aws*,nghttp2}.a
 $DST_DIR/lib/i386
 fi
 
 # Do the same also for ucrt64
@@ -87,7 +87,7 @@ if [ -d ucrt64/lib/ ]; then
   ls $MSYS_LIB_DIR/ucrt64/lib/
   mkdir -p $DST_DIR/lib/x64-ucrt
   mv ucrt64/lib/*.a $DST_DIR/lib/x64-ucrt
-  cp 
$MSYS_LIB_DIR/ucrt64/lib/lib{thrift,snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,aws*}.a
 $DST_DIR/lib/x64-ucrt
+  cp 
$MSYS_LIB_DIR/ucrt64/lib/lib{thrift,snappy,zstd,lz4,brotli*,bz2,crypto,curl,ss*,utf8proc,re2,aws*,nghttp2}.a
 $DST_DIR/lib/x64-ucrt
 fi
 
 # Create build artifact
diff --git a/r/configure.win b/r/configure.win
index 1eb72e1561..f416e75f3c 100755
--- a/r/configure.win
+++ b/r/configure.win
@@ -33,7 +33,7 @@ AWS_LIBS="-laws-cpp-sdk-config -laws-cpp-sdk-transfer 
-laws-cpp-sdk-identity-man
           -lUserenv -lversion -lws2_32 -lBcrypt -lWininet -lwinhttp"
 # pkg-config --libs libcurl
 GCS_LIBS="-lcurl -lnormaliz -lssh2 -lgdi32 -lssl -lcrypto -lcrypt32 -lwldap32 \
-          -lz -lws2_32"
+          -lz -lws2_32 -lnghttp2"
 
 function configure_release() {
   VERSION=$(grep ^Version DESCRIPTION | sed s/Version:\ //)