Switch macro to ADBC_STATIC

WillAyd · WillAyd · commit 2eaf405f7c6d · 2025-04-28T09:51:26.000-04:00
diff --git a/c/cmake_modules/GoUtils.cmake b/c/cmake_modules/GoUtils.cmake
@@ -52,6 +52,7 @@ function(adbc_add_static_library target_name base_name)
   set(static_base_name
     "${CMAKE_STATIC_LIBRARY_PREFIX}${base_name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
   add_library(${target_name} STATIC IMPORTED)
+  target_compile_definitions(${target_name} ADBC_STATIC)
   if(WINDOWS)
     set_target_properties(${target_name}
       PROPERTIES
diff --git a/c/driver/bigquery/adbc-driver-bigquery.pc.in b/c/driver/bigquery/adbc-driver-bigquery.pc.in
@@ -23,3 +23,4 @@ Description: The ADBC BigQuery driver provides an ADBC driver for BigQuery.
 URL: https://github.com/apache/arrow-adbc
 Version: @ADBC_VERSION@
 Libs: -L${libdir} -ladbc_driver_bigquery
+Libs.private: -DADBC_STATIC
diff --git a/c/driver/bigquery/meson.build b/c/driver/bigquery/meson.build
@@ -53,6 +53,7 @@ pkg.generate(
     libraries: [adbc_driver_bigquery_lib],
     url: 'https://github.com/apache/arrow-adbc',
     filebase: 'adbc-driver-bigquery',
+    libraries_private: '-DADBC_STATIC',
 )
 
 exc = executable(
diff --git a/c/driver/common/CMakeLists.txt b/c/driver/common/CMakeLists.txt
@@ -16,6 +16,7 @@
 # under the License.
 
 add_library(adbc_driver_common STATIC utils.c)
+target_compile_definitions(adbc_driver_common PRIVATE ADBC_STATIC)
 adbc_configure_target(adbc_driver_common)
 set_target_properties(adbc_driver_common PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(adbc_driver_common PRIVATE "${REPOSITORY_ROOT}/c/include")
diff --git a/c/driver/common/meson.build b/c/driver/common/meson.build
@@ -21,8 +21,8 @@ adbc_common_lib = library(
     include_directories: [include_dir],
     dependencies: [nanoarrow_dep],
     install: true,
-    c_shared_args: adbc_c_shared_args,
-    cpp_shared_args: adbc_cpp_shared_args,
+    c_static_args: adbc_c_static_args,
+    cpp_static_args: adbc_cpp_static_args,
 )
 
 exc = executable(
diff --git a/c/driver/flightsql/adbc-driver-flightsql.pc.in b/c/driver/flightsql/adbc-driver-flightsql.pc.in
@@ -23,3 +23,4 @@ Description: The ADBC Flight SQL driver provides an ADBC driver for Flight SQL.
 URL: https://github.com/apache/arrow-adbc
 Version: @ADBC_VERSION@
 Libs: -L${libdir} -ladbc_driver_flightsql
+Libs.private: -DADBC_STATIC
diff --git a/c/driver/flightsql/meson.build b/c/driver/flightsql/meson.build
@@ -53,6 +53,7 @@ pkg.generate(
     url: 'https://github.com/apache/arrow-adbc',
     libraries: [adbc_driver_flightsql_lib],
     filebase: 'adbc-driver-flightsql',
+    libraries_private: '-DADBC_STATIC',
 )
 
 exc = executable(
diff --git a/c/driver/framework/CMakeLists.txt b/c/driver/framework/CMakeLists.txt
@@ -24,7 +24,7 @@ target_include_directories(adbc_driver_framework
                            PRIVATE "${REPOSITORY_ROOT}/c/" "${REPOSITORY_ROOT}/c/include"
                                    "${REPOSITORY_ROOT}/c/vendor")
 target_link_libraries(adbc_driver_framework PUBLIC adbc_driver_common fmt::fmt)
-target_compile_definitions(adbc_driver_framework PRIVATE ADBC_EXPORTING)
+target_compile_definitions(adbc_driver_framework PRIVATE ADBC_EXPORTING ADBC_STATIC)
 
 if(ADBC_BUILD_TESTS)
   add_test_case(driver_framework_test
diff --git a/c/driver/framework/meson.build b/c/driver/framework/meson.build
@@ -23,6 +23,6 @@ adbc_framework_lib = library(
     dependencies: [nanoarrow_dep, fmt_dep],
     install: true,
     gnu_symbol_visibility: 'hidden',
-    c_shared_args: adbc_c_shared_args,
-    cpp_shared_args: adbc_cpp_shared_args,
+    c_static_args: adbc_c_static_args,
+    cpp_static_args: adbc_cpp_static_args,
 )
diff --git a/c/driver/postgresql/CMakeLists.txt b/c/driver/postgresql/CMakeLists.txt
@@ -55,8 +55,8 @@ add_arrow_lib(adbc_driver_postgresql
 
 foreach(LIB_TARGET ${ADBC_LIBRARIES})
   target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING)
-  if(ADBC_BUILD_SHARED)
-    target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_BUILD_DLL)
+  if(ADBC_BUILD_STATIC)
+    target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_STATIC)
   endif()
   target_include_directories(${LIB_TARGET} SYSTEM
                              PRIVATE ${REPOSITORY_ROOT}/c/ ${REPOSITORY_ROOT}/c/include/
diff --git a/c/driver/postgresql/adbc-driver-postgresql.pc.in b/c/driver/postgresql/adbc-driver-postgresql.pc.in
@@ -23,4 +23,5 @@ Name: Apache Arrow Database Connectivity (ADBC) PostgreSQL driver
 Description: The ADBC PostgreSQL driver provides an ADBC driver for PostgreSQL.
 Version: @ADBC_VERSION@
 Libs: -L${libdir} -ladbc_driver_postgresql
+Libs.private: -DADBC_STATIC
 Cflags: -I${includedir}
diff --git a/c/driver/postgresql/meson.build b/c/driver/postgresql/meson.build
@@ -32,8 +32,8 @@ adbc_postgres_driver_lib = library(
     link_with: [adbc_common_lib, adbc_framework_lib],
     dependencies: [nanoarrow_dep, fmt_dep, libpq_dep],
     gnu_symbol_visibility: 'hidden',
-    c_shared_args: adbc_c_shared_args,
-    cpp_shared_args: adbc_cpp_shared_args,
+    c_static_args: adbc_c_static_args,
+    cpp_static_args: adbc_cpp_static_args,
 )
 
 pkg.generate(
@@ -42,6 +42,7 @@ pkg.generate(
     url: 'https://github.com/apache/arrow-adbc',
     libraries: [adbc_postgres_driver_lib],
     filebase: 'adbc-driver-postgresql',
+    libraries_private: '-DADBC_STATIC',
 )
 
 postgres_tests = {
diff --git a/c/driver/snowflake/adbc-driver-snowflake.pc.in b/c/driver/snowflake/adbc-driver-snowflake.pc.in
@@ -23,3 +23,4 @@ Description: The ADBC Snowflake driver provides an ADBC driver for Snowflake.
 URL: https://github.com/apache/arrow-adbc
 Version: @ADBC_VERSION@
 Libs: -L${libdir} -ladbc_driver_snowflake
+Libs.private: -DADBC_STATIC
diff --git a/c/driver/snowflake/meson.build b/c/driver/snowflake/meson.build
@@ -53,6 +53,7 @@ pkg.generate(
     url: 'https://github.com/apache/arrow-adbc',
     libraries: [adbc_driver_snowflake_lib],
     filebase: 'adbc-driver-snowflake',
+    libraries_private: '-DADBC_STATIC',
 )
 
 exc = executable(
diff --git a/c/driver/sqlite/CMakeLists.txt b/c/driver/sqlite/CMakeLists.txt
@@ -61,8 +61,8 @@ add_arrow_lib(adbc_driver_sqlite
 foreach(LIB_TARGET ${ADBC_LIBRARIES})
   target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING
                                                    ${ADBC_SQLITE_COMPILE_DEFINES})
-  if(ADBC_BUILD_SHARED)
-    target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_BUILD_DLL)
+  if(ADBC_BUILD_STATIC)
+    target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_STATIC)
   endif()
   target_include_directories(${LIB_TARGET} SYSTEM
                              PRIVATE ${REPOSITORY_ROOT}/c/ ${REPOSITORY_ROOT}/c/include/
diff --git a/c/driver/sqlite/adbc-driver-sqlite.pc.in b/c/driver/sqlite/adbc-driver-sqlite.pc.in
@@ -24,4 +24,5 @@ Description: The ADBC SQLite driver provides an ADBC driver for SQLite.
 URL: https://github.com/apache/arrow-adbc
 Version: @ADBC_VERSION@
 Libs: -L${libdir} -ladbc_driver_sqlite
+Libs.private: -DADBC_STATIC
 Cflags: -I${includedir}
diff --git a/c/driver/sqlite/meson.build b/c/driver/sqlite/meson.build
@@ -30,8 +30,8 @@ adbc_sqlite3_driver_lib = library(
     dependencies: [nanoarrow_dep, fmt_dep, sqlite3_dep],
     c_args: ['-DSIZEOF_TIME_T=' + time_t_size.to_string()],
     gnu_symbol_visibility: 'hidden',
-    c_shared_args: adbc_c_shared_args,
-    cpp_shared_args: adbc_cpp_shared_args,
+    c_static_args: adbc_c_static_args,
+    cpp_static_args: adbc_cpp_static_args,
 )
 
 pkg.generate(
@@ -40,6 +40,7 @@ pkg.generate(
     url: 'https://github.com/apache/arrow-adbc',
     libraries: [adbc_sqlite3_driver_lib],
     filebase: 'adbc-driver-sqlite',
+    libraries_private: '-DADBC_STATIC',
 )
 
 exc = executable(
diff --git a/c/driver_manager/CMakeLists.txt b/c/driver_manager/CMakeLists.txt
@@ -41,8 +41,8 @@ foreach(LIB_TARGET ${ADBC_LIBRARIES})
                                      ${REPOSITORY_ROOT}/c/vendor
                                      ${REPOSITORY_ROOT}/c/driver)
   target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING)
-  if(ADBC_BUILD_SHARED)
-    target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_BUILD_DLL)
+  if(ADBC_BUILD_STATIC)
+    target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_STATIC)
   endif()
 endforeach()
 
diff --git a/c/driver_manager/adbc-driver-manager.pc.in b/c/driver_manager/adbc-driver-manager.pc.in
@@ -24,4 +24,5 @@ Description: ADBC driver manager provides API to use ADBC driver.
 URL: https://github.com/apache/arrow-adbc
 Version: @ADBC_VERSION@
 Libs: -L${libdir} -ladbc_driver_manager
+Libs.private: -DADBC_STATIC
 Cflags: -I${includedir}
diff --git a/c/driver_manager/meson.build b/c/driver_manager/meson.build
@@ -24,8 +24,8 @@ adbc_driver_manager_lib = library(
     install: true,
     dependencies: [dl_dep],
     gnu_symbol_visibility: 'hidden',
-    c_shared_args: adbc_c_shared_args,
-    cpp_shared_args: adbc_cpp_shared_args,
+    c_static_args: adbc_c_static_args,
+    cpp_static_args: adbc_cpp_static_args,
 )
 
 pkg.generate(
@@ -34,4 +34,5 @@ pkg.generate(
     url: 'https://github.com/apache/arrow-adbc',
     libraries: [adbc_driver_manager_lib],
     filebase: 'adbc-driver-manager',
+    libraries_private: '-DADBC_STATIC',
 )
diff --git a/c/include/arrow-adbc/adbc.h b/c/include/arrow-adbc/adbc.h
@@ -152,7 +152,7 @@ struct ArrowArrayStream {
 // Storage class macros for Windows
 // Allow overriding/aliasing with application-defined macros
 #if !defined(ADBC_EXPORT)
-#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(ADBC_BUILD_DLL)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(ADBC_STATIC)
 #if defined(ADBC_EXPORTING)
 #define ADBC_EXPORT __declspec(dllexport)
 #else
@@ -164,7 +164,7 @@ struct ArrowArrayStream {
 #else
 #define ADBC_EXPORT
 #endif  // defined(__GNUC__) && __GNUC__ >= 4
-#endif  // (defined(_WIN32) || defined(__CYGWIN__)) && defined(ADBC_BUILD_DLL)
+#endif  // (defined(_WIN32) || defined(__CYGWIN__)) && !defined(ADBC_STATIC)
 #endif  // !defined(ADBC_EXPORT)
 
 /// \defgroup adbc-error-handling Error Handling
diff --git a/c/meson.build b/c/meson.build
@@ -58,15 +58,13 @@ needs_driver_manager = get_option('driver_manager').enabled() \
 
 pkg = import('pkgconfig')
 
+add_project_arguments('-DADBC_EXPORTING', language: 'c')
+add_project_arguments('-DADBC_EXPORTING', language: 'cpp')
 # Meson does not support a global/project wide way of setting c/cpp
-# arguments only for shared libraries, so we have to do this per target
+# arguments only for static libraries, so we have to do this per target
 # See https://github.com/mesonbuild/meson/issues/10996
-adbc_c_shared_args = ['-DADBC_EXPORTING']
-adbc_cpp_shared_args = ['-DADBC_EXPORTING']
-if host_machine.system() == 'windows'
-    adbc_c_shared_args += ['-DADBC_BUILD_DLL']
-    adbc_cpp_shared_args += ['-DADBC_BUILD_DLL']
-endif
+adbc_c_static_args = ['-DADBC_STATIC']
+adbc_cpp_static_args = ['-DADBC_STATIC']
 
 if needs_driver_manager
     install_headers('include/adbc_driver_manager.h')
diff --git a/c/validation/CMakeLists.txt b/c/validation/CMakeLists.txt
@@ -17,6 +17,7 @@
 
 add_library(adbc_validation_util STATIC adbc_validation_util.cc)
 adbc_configure_target(adbc_validation_util)
+target_compile_definitions(adbc_validation_util PRIVATE ADBC_STATIC)
 target_compile_features(adbc_validation_util PRIVATE cxx_std_17)
 target_include_directories(adbc_validation_util SYSTEM
                            PRIVATE "${REPOSITORY_ROOT}/c/include/"
diff --git a/c/validation/meson.build b/c/validation/meson.build
@@ -22,6 +22,8 @@ adbc_validation_util_lib = static_library(
     include_directories: [include_dir, driver_dir],
     link_with: [adbc_common_lib, adbc_framework_lib, adbc_driver_manager_lib],
     dependencies: [nanoarrow_dep, gtest_main_dep, gmock_dep],
+    c_args: adbc_c_static_args,
+    cpp_args: adbc_cpp_static_args,
 )
 
 adbc_validation_dep = declare_dependency(
diff --git a/go/adbc/drivermgr/arrow-adbc/adbc.h b/go/adbc/drivermgr/arrow-adbc/adbc.h
@@ -152,7 +152,7 @@ struct ArrowArrayStream {
 // Storage class macros for Windows
 // Allow overriding/aliasing with application-defined macros
 #if !defined(ADBC_EXPORT)
-#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(ADBC_BUILD_DLL)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(ADBC_STATIC)
 #if defined(ADBC_EXPORTING)
 #define ADBC_EXPORT __declspec(dllexport)
 #else
@@ -164,7 +164,7 @@ struct ArrowArrayStream {
 #else
 #define ADBC_EXPORT
 #endif  // defined(__GNUC__) && __GNUC__ >= 4
-#endif  // (defined(_WIN32) || defined(__CYGWIN__)) && defined(ADBC_BUILD_DLL)
+#endif  // (defined(_WIN32) || defined(__CYGWIN__)) && !defined(ADBC_STATIC)
 #endif  // !defined(ADBC_EXPORT)
 
 /// \defgroup adbc-error-handling Error Handling
diff --git a/go/adbc/pkg/_tmpl/driver.go.tmpl b/go/adbc/pkg/_tmpl/driver.go.tmpl
@@ -22,8 +22,8 @@ package main
 // ADBC_EXPORTING is required on Windows, or else the symbols
 // won't be accessible to the driver manager
 
-// #cgo CFLAGS: -DADBC_EXPORTING -DADBC_BUILD_DLL
-// #cgo CXXFLAGS: -std=c++11 -DADBC_EXPORTING -DADBC_BUILD_DLL
+// #cgo CFLAGS: -DADBC_EXPORTING
+// #cgo CXXFLAGS: -std=c++11 -DADBC_EXPORTING
 // #include "../../drivermgr/arrow-adbc/adbc.h"
 // #include "utils.h"
 // #include <errno.h>
diff --git a/go/adbc/pkg/bigquery/driver.go b/go/adbc/pkg/bigquery/driver.go
diff --git a/go/adbc/pkg/flightsql/driver.go b/go/adbc/pkg/flightsql/driver.go
diff --git a/go/adbc/pkg/snowflake/driver.go b/go/adbc/pkg/snowflake/driver.go

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ pkg.generate(`
`53`	`53`	`libraries: [adbc_driver_bigquery_lib],`
`54`	`54`	`url: 'https://github.com/apache/arrow-adbc',`
`55`	`55`	`filebase: 'adbc-driver-bigquery',`
	`56`	`+ libraries_private: '-DADBC_STATIC',`
`56`	`57`	`)`
`57`	`58`
`58`	`59`	`exc = executable(`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ adbc_framework_lib = library(`
`23`	`23`	`dependencies: [nanoarrow_dep, fmt_dep],`
`24`	`24`	`install: true,`
`25`	`25`	`gnu_symbol_visibility: 'hidden',`
`26`		`- c_shared_args: adbc_c_shared_args,`
`27`		`- cpp_shared_args: adbc_cpp_shared_args,`
	`26`	`+ c_static_args: adbc_c_static_args,`
	`27`	`+ cpp_static_args: adbc_cpp_static_args,`
`28`	`28`	`)`