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

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


The following commit(s) were added to refs/heads/main by this push:
     new 82d48a93d0 GH-34977: [C++] Fix "Requires" format in arrow-dataset.pc 
(#34978)
82d48a93d0 is described below

commit 82d48a93d0dc5ea7826207f154d9f6a1250ec57b
Author: Sutou Kouhei <[email protected]>
AuthorDate: Sat Apr 8 07:54:24 2023 +0900

    GH-34977: [C++] Fix "Requires" format in arrow-dataset.pc (#34978)
    
    ### Rationale for this change
    
    `Requires: arrow_acero;parquet` is invalid.
    
    ### What changes are included in this PR?
    
    Use `Requires: arrow-acero parquet`.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    Yes.
    * Closes: #34977
    
    Authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Sutou Kouhei <[email protected]>
---
 cpp/src/arrow/acero/CMakeLists.txt    | 2 --
 cpp/src/arrow/acero/arrow-acero.pc.in | 2 +-
 cpp/src/arrow/dataset/CMakeLists.txt  | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cpp/src/arrow/acero/CMakeLists.txt 
b/cpp/src/arrow/acero/CMakeLists.txt
index d7a9878695..a07cdc913b 100644
--- a/cpp/src/arrow/acero/CMakeLists.txt
+++ b/cpp/src/arrow/acero/CMakeLists.txt
@@ -59,8 +59,6 @@ append_acero_avx2_src(bloom_filter_avx2.cc)
 append_acero_avx2_src(swiss_join_avx2.cc)
 append_acero_avx2_src(util_avx2.cc)
 
-set(ARROW_ACERO_PKG_CONFIG_REQUIRES arrow)
-
 set(ARROW_ACERO_SHARED_LINK_LIBS)
 set(ARROW_ACERO_STATIC_LINK_LIBS)
 set(ARROW_ACERO_STATIC_INSTALL_INTERFACE_LIBS)
diff --git a/cpp/src/arrow/acero/arrow-acero.pc.in 
b/cpp/src/arrow/acero/arrow-acero.pc.in
index d082e179ce..fde3262b9a 100644
--- a/cpp/src/arrow/acero/arrow-acero.pc.in
+++ b/cpp/src/arrow/acero/arrow-acero.pc.in
@@ -22,6 +22,6 @@ libdir=@ARROW_PKG_CONFIG_LIBDIR@
 Name: Apache Arrow Acero Engine
 Description: Apache Arrow's Acero Engine.
 Version: @ARROW_VERSION@
-Requires: @ARROW_ACERO_PKG_CONFIG_REQUIRES@
+Requires: arrow
 Libs: -L${libdir} -larrow_acero
 Cflags.private: -DARROW_ACERO_STATIC
diff --git a/cpp/src/arrow/dataset/CMakeLists.txt 
b/cpp/src/arrow/dataset/CMakeLists.txt
index 85dae9053e..7bffdbf08c 100644
--- a/cpp/src/arrow/dataset/CMakeLists.txt
+++ b/cpp/src/arrow/dataset/CMakeLists.txt
@@ -31,9 +31,9 @@ set(ARROW_DATASET_SRCS
     scanner.cc
     scan_node.cc)
 
-set(ARROW_DATASET_PKG_CONFIG_REQUIRES arrow_acero)
+set(ARROW_DATASET_PKG_CONFIG_REQUIRES "arrow-acero")
 if(ARROW_PARQUET)
-  list(APPEND ARROW_DATASET_PKG_CONFIG_REQUIRES parquet)
+  string(APPEND ARROW_DATASET_PKG_CONFIG_REQUIRES " parquet")
 endif()
 
 set(ARROW_DATASET_STATIC_LINK_LIBS)

Reply via email to