This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new a67ab5a50 build(c/driver/postgresql): include portable-snippets (#3643)
a67ab5a50 is described below
commit a67ab5a509676feaec8e24dba479d4de8dc083e2
Author: David Li <[email protected]>
AuthorDate: Wed Oct 29 13:55:06 2025 +0900
build(c/driver/postgresql): include portable-snippets (#3643)
Avoid exposing other vendored libraries on accident.
Closes #3642.
---
c/driver/postgresql/CMakeLists.txt | 16 ++++++++++++----
.../{ => include/portable-snippets}/safe-math.h | 0
dev/release/rat_exclude_files.txt | 2 +-
r/adbcpostgresql/src/Makevars.in | 2 +-
r/adbcpostgresql/src/Makevars.ucrt | 2 +-
r/adbcpostgresql/src/Makevars.win | 2 +-
6 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/c/driver/postgresql/CMakeLists.txt
b/c/driver/postgresql/CMakeLists.txt
index e044a20d1..35f56d1d7 100644
--- a/c/driver/postgresql/CMakeLists.txt
+++ b/c/driver/postgresql/CMakeLists.txt
@@ -56,8 +56,12 @@ add_arrow_lib(adbc_driver_postgresql
foreach(LIB_TARGET ${ADBC_LIBRARIES})
target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING)
target_include_directories(${LIB_TARGET} SYSTEM
- PRIVATE ${REPOSITORY_ROOT}/c/
${REPOSITORY_ROOT}/c/include/
- ${LIBPQ_INCLUDE_DIRS}
${REPOSITORY_ROOT}/c/driver)
+ PRIVATE ${REPOSITORY_ROOT}/c/
+ ${REPOSITORY_ROOT}/c/include/
+ ${LIBPQ_INCLUDE_DIRS}
+ ${REPOSITORY_ROOT}/c/driver
+
${REPOSITORY_ROOT}/c/vendor/portable-snippets/include
+ )
if(NOT ADBC_DEFINE_COMMON_ENTRYPOINTS)
target_compile_definitions(${LIB_TARGET} PRIVATE
${ADBC_TARGET_COMPILE_DEFINITIONS})
@@ -103,8 +107,12 @@ if(ADBC_BUILD_TESTS)
${TEST_LINK_LIBS})
target_compile_features(adbc-driver-postgresql-copy-test PRIVATE cxx_std_17)
target_include_directories(adbc-driver-postgresql-copy-test SYSTEM
- PRIVATE ${REPOSITORY_ROOT}/c/
${REPOSITORY_ROOT}/c/include/
- ${LIBPQ_INCLUDE_DIRS}
${REPOSITORY_ROOT}/c/driver)
+ PRIVATE ${REPOSITORY_ROOT}/c/
+ ${REPOSITORY_ROOT}/c/include/
+ ${LIBPQ_INCLUDE_DIRS}
+ ${REPOSITORY_ROOT}/c/driver
+
${REPOSITORY_ROOT}/c/vendor/portable-snippets/include
+ )
adbc_configure_target(adbc-driver-postgresql-copy-test)
endif()
diff --git a/c/vendor/portable-snippets/safe-math.h
b/c/vendor/portable-snippets/include/portable-snippets/safe-math.h
similarity index 100%
rename from c/vendor/portable-snippets/safe-math.h
rename to c/vendor/portable-snippets/include/portable-snippets/safe-math.h
diff --git a/dev/release/rat_exclude_files.txt
b/dev/release/rat_exclude_files.txt
index 7904bc3c4..0f730fa3c 100644
--- a/dev/release/rat_exclude_files.txt
+++ b/dev/release/rat_exclude_files.txt
@@ -11,7 +11,7 @@ c/vendor/backward/*
c/vendor/fmt/*
c/vendor/sqlite3/sqlite3.c
c/vendor/sqlite3/sqlite3.h
-c/vendor/portable-snippets/safe-math.h
+c/vendor/portable-snippets/include/portable-snippets/safe-math.h
ci/conda/.ci_support/*
ci/conda/.gitattributes
ci/linux-packages/changelog
diff --git a/r/adbcpostgresql/src/Makevars.in b/r/adbcpostgresql/src/Makevars.in
index be1b87253..45320aa7d 100644
--- a/r/adbcpostgresql/src/Makevars.in
+++ b/r/adbcpostgresql/src/Makevars.in
@@ -16,7 +16,7 @@
# under the License.
CXX_STD = CXX17
-PKG_CPPFLAGS=-I../src/c -I../src/c/include -I../src/c/vendor/
-I../src/c/vendor/fmt/include @cppflags@ -DADBC_EXPORT="" -DFMT_HEADER_ONLY=1
+PKG_CPPFLAGS=-I../src/c -I../src/c/include -I../src/c/vendor/
-I../src/c/vendor/portable-snippets/include/ -I../src/c/vendor/fmt/include
@cppflags@ -DADBC_EXPORT="" -DFMT_HEADER_ONLY=1
PKG_LIBS=@libs@
OBJECTS = init.o \
diff --git a/r/adbcpostgresql/src/Makevars.ucrt
b/r/adbcpostgresql/src/Makevars.ucrt
index 275fa4025..3a14f02dc 100644
--- a/r/adbcpostgresql/src/Makevars.ucrt
+++ b/r/adbcpostgresql/src/Makevars.ucrt
@@ -16,7 +16,7 @@
# under the License.
CXX_STD = CXX17
-PKG_CPPFLAGS = -I../src/c -I../src/c/include -I../src/c/vendor/
-I../src/c/vendor/fmt/include -DADBC_EXPORT="" -D__USE_MINGW_ANSI_STDIO
-DFMT_HEADER_ONLY=1
+PKG_CPPFLAGS = -I../src/c -I../src/c/include -I../src/c/vendor/
-I../src/c/vendor/portable-snippets/include/ -I../src/c/vendor/fmt/include
-DADBC_EXPORT="" -D__USE_MINGW_ANSI_STDIO -DFMT_HEADER_ONLY=1
PKG_LIBS = -lpq -lpgcommon -lpgport -lssl -lcrypto -lz -lsecur32 -lws2_32
-lwldap32 -lcrypt32
diff --git a/r/adbcpostgresql/src/Makevars.win
b/r/adbcpostgresql/src/Makevars.win
index 1937905cc..077a69ea1 100644
--- a/r/adbcpostgresql/src/Makevars.win
+++ b/r/adbcpostgresql/src/Makevars.win
@@ -18,7 +18,7 @@
VERSION = 13.2.0
RWINLIB = ../windows/libpq-$(VERSION)
CXX_STD = CXX17
-PKG_CPPFLAGS = -I$(RWINLIB)/include -I../src/c -I../src/c/include
-I../src/c/vendor/ -I../src/c/vendor/fmt/include -DADBC_EXPORT=""
-D__USE_MINGW_ANSI_STDIO -DFMT_HEADER_ONLY=1
+PKG_CPPFLAGS = -I$(RWINLIB)/include -I../src/c -I../src/c/include
-I../src/c/vendor/ -I../src/c/vendor/portable-snippets/include/
-I../src/c/vendor/fmt/include -DADBC_EXPORT="" -D__USE_MINGW_ANSI_STDIO
-DFMT_HEADER_ONLY=1
PKG_LIBS = -L$(RWINLIB)/lib${R_ARCH}${CRT} \
-lpq -lpgport -lpgcommon -lssl -lcrypto -lwsock32 -lsecur32 -lws2_32
-lgdi32 -lcrypt32 -lwldap32
