Build pgPointCloud libpc.a without autotools to enable POINTCLOUD

vcpkg.json

@@ -7,6 +7,7 @@
           "vcpkg-cmake",
           "openssl",
           "zlib",
+          "libxml2",
           "expat",
           {
             "name": "sqlite3",

vcpkg_ports/meos/portfile.cmake

@@ -17,6 +17,151 @@ endif()
 ]=]
 )
 
+# Newer C compilers (CI's GCC 14 / gcc-toolset-14 on Linux and AppleClang 17
+# on macOS) promote several long-standing C laxities to hard errors by default:
+# implicit-function-declaration, incompatible-pointer-types, int-conversion.
+# The pinned MEOS builds cleanly on GCC 11 (these are warnings there) but its
+# postgres-vendored code and a few internal call sites rely on those laxities,
+# so the build fails on the newer toolchains. Downgrade exactly that C-permerror
+# set back to warnings. These -Wno-error flags are honoured by BOTH GCC and
+# Clang (unlike -fpermissive, which Clang silently ignores for C, leaving the
+# macOS build broken). add_compile_options is inherited by every MEOS target
+# defined afterwards.
+vcpkg_replace_string(
+    "${SOURCE_PATH}/CMakeLists.txt"
+    "add_compile_definitions(_USE_MATH_DEFINES)"
+    "add_compile_definitions(_USE_MATH_DEFINES)\nadd_compile_options(-Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types -Wno-error=int-conversion)"
+)
+
+# Upstream MEOS-standalone gap: meos/include/pointcloud/{pcpoint,pcpatch}.h
+# define DatumGetPcpointP / DatumGetPcpatchP via PG_DETOAST_DATUM
+# UNCONDITIONALLY, unlike every other type header (temporal.h etc.) which
+# uses `((T *) DatumGetPointer(X))` under `#if MEOS`. PG_DETOAST_DATUM lives
+# only in PostgreSQL's fmgr.h (not bundled for MEOS), so libmeos built with
+# -DPOINTCLOUD=ON has unresolved `PG_DETOAST_DATUM` at link. Mirror the MEOS
+# branch (MEOS values are never TOASTed). FIX UPSTREAM: add the #if MEOS guard.
+vcpkg_replace_string(
+    "${SOURCE_PATH}/meos/include/pointcloud/pcpoint.h"
+    "((Pcpoint *) PG_DETOAST_DATUM(X))"
+    "((Pcpoint *) DatumGetPointer(X))"
+)
+vcpkg_replace_string(
+    "${SOURCE_PATH}/meos/include/pointcloud/pcpatch.h"
+    "((Pcpatch *) PG_DETOAST_DATUM(X))"
+    "((Pcpatch *) DatumGetPointer(X))"
+)
+
+# pgPointCloud enabler. -DPOINTCLOUD=ON makes meos/src/pointcloud/
+# CMakeLists.txt FATAL_ERROR unless pointcloud-pg/lib/libpc.a exists; it is
+# built as a side effect of pgPointCloud's `./autogen.sh && ./configure &&
+# make`, which cannot run here (no autotools-usable PostgreSQL, no pg_config).
+# The vendored pointcloud-pg/lib sources need only libxml2 and zlib (no
+# PostgreSQL headers), and pointcloud-pg/lib/Makefile builds libpc.a directly
+# via `ar rs` with the XML2/ZLIB CPPFLAGS from config.mk. So we generate
+# config.mk + lib/pc_config.h the way pgPointCloud's autotools would (filling
+# only the @VARS@ the lib OBJS consume, with vcpkg's libxml2/zlib paths), then
+# build the libpc.a archive target directly. CUnit/LazPerf stay disabled.
+set(POINTCLOUD_DIR "${SOURCE_PATH}/pointcloud-pg")
+
+# pgPointCloud's lib/Makefile uses a plain `cc` with no awareness of vcpkg's
+# macOS cross-compile settings, so on the osx builds (e.g. an x86_64 target
+# compiled on an arm64 runner) it emits objects of the wrong architecture and
+# the final extension link rejects libpc.a ("found architecture 'arm64',
+# required architecture 'x86_64'"). Mirror vcpkg's macOS target flags into the
+# libpc build. Empty (no-op) on Linux.
+set(_PC_OSX_FLAGS "")
+if(VCPKG_TARGET_IS_OSX)
+    # Prefer the triplet's explicit arch list; fall back to the always-set
+    # VCPKG_TARGET_ARCHITECTURE (community osx triplets often leave
+    # VCPKG_OSX_ARCHITECTURES empty).
+    if(VCPKG_OSX_ARCHITECTURES)
+        foreach(_a IN LISTS VCPKG_OSX_ARCHITECTURES)
+            string(APPEND _PC_OSX_FLAGS " -arch ${_a}")
+        endforeach()
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+        string(APPEND _PC_OSX_FLAGS " -arch x86_64")
+    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+        string(APPEND _PC_OSX_FLAGS " -arch arm64")
+    endif()
+    if(VCPKG_OSX_DEPLOYMENT_TARGET)
+        string(APPEND _PC_OSX_FLAGS " -mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET}")
+    endif()
+    if(VCPKG_OSX_SYSROOT)
+        string(APPEND _PC_OSX_FLAGS " -isysroot ${VCPKG_OSX_SYSROOT}")
+    endif()
+endif()
+
+file(WRITE "${POINTCLOUD_DIR}/config.mk"
+"CC = cc
+CFLAGS = -O2 -fPIC${_PC_OSX_FLAGS} -Dstringbuffer_append=pc_stringbuffer_append -Dstringbuffer_aprintf=pc_stringbuffer_aprintf -Dstringbuffer_avprintf=pc_stringbuffer_avprintf -Dstringbuffer_clear=pc_stringbuffer_clear -Dstringbuffer_copy=pc_stringbuffer_copy -Dstringbuffer_create=pc_stringbuffer_create -Dstringbuffer_create_with_size=pc_stringbuffer_create_with_size -Dstringbuffer_destroy=pc_stringbuffer_destroy -Dstringbuffer_getlength=pc_stringbuffer_getlength -Dstringbuffer_getstring=pc_stringbuffer_getstring -Dstringbuffer_getstringcopy=pc_stringbuffer_getstringcopy -Dstringbuffer_lastchar=pc_stringbuffer_lastchar -Dstringbuffer_makeroom=pc_stringbuffer_makeroom -Dstringbuffer_release_string=pc_stringbuffer_release_string -Dstringbuffer_set=pc_stringbuffer_set -Dstringbuffer_trim_trailing_white=pc_stringbuffer_trim_trailing_white -Dstringbuffer_trim_trailing_zeroes=pc_stringbuffer_trim_trailing_zeroes
+CXXFLAGS += -fPIC -std=c++0x${_PC_OSX_FLAGS}
+SQLPP =
+
+XML2_CPPFLAGS = -I${CURRENT_INSTALLED_DIR}/include/libxml2
+XML2_LDFLAGS = -L${CURRENT_INSTALLED_DIR}/lib -lxml2
+
+ZLIB_CPPFLAGS = -I${CURRENT_INSTALLED_DIR}/include
+ZLIB_LDFLAGS = -L${CURRENT_INSTALLED_DIR}/lib -lz
+
+CUNIT_CPPFLAGS =
+CUNIT_LDFLAGS =
+
+PG_CONFIG =
+PGXS =
+
+LIB_A = libpc.a
+LIB_A_LAZPERF = liblazperf.a
+
+LAZPERF_STATUS = disabled
+LAZPERF_CPPFLAGS =
+
+PGSQL_MAJOR_VERSION =
+")
+
+# lib/pc_config.h: pc_api.h does `#include \"pc_config.h\"`, normally emitted
+# by config.status. Mirror the no-lazperf / no-cunit autotools output (leave
+# HAVE_LAZPERF / HAVE_CUNIT undefined). POINTCLOUD_VERSION = Version.config.
+file(WRITE "${POINTCLOUD_DIR}/lib/pc_config.h"
+"/* #undef LIBXML2_VERSION */
+
+/* #undef PGSQL_VERSION */
+
+/* #undef HAVE_LAZPERF */
+
+/* #undef HAVE_CUNIT */
+
+#define PROJECT_SOURCE_DIR \"${POINTCLOUD_DIR}\"
+
+#define POINTCLOUD_VERSION \"1.2.5\"
+")
+
+# Build the libpc.a archive target directly (NOT `all`, which recurses into
+# cunit/ and needs CUnit). config.mk is included by lib/Makefile.
+vcpkg_execute_required_process(
+    COMMAND make -C "${POINTCLOUD_DIR}/lib" libpc.a
+    WORKING_DIRECTORY "${POINTCLOUD_DIR}/lib"
+    LOGNAME "build-libpc-${TARGET_TRIPLET}"
+)
+
+# NOTE: the stringbuffer_* symbol collision between pgPointCloud's lib
+# (a verbatim fork of PostGIS liblwgeom/stringbuffer.c) and MEOS's own
+# bundled liblwgeom is resolved at COMPILE time by the
+# -Dstringbuffer_*=pc_stringbuffer_* defines injected into config.mk's
+# CFLAGS above. That renames every definition AND reference inside libpc.a
+# to a private pc_stringbuffer_* namespace, keeping libpc.a self-contained
+# (it does NOT depend on MEOS providing those symbols) and needing no
+# post-build symbol surgery. This is portable across GCC and Clang, unlike
+# the previous objcopy --redefine-syms pass (GNU objcopy is absent on macOS)
+# and unlike dropping stringbuffer.o (which left other libpc objects with
+# unresolved stringbuffer_* references in targets that don't link libmeos).
+
+# meos/src/pointcloud/CMakeLists.txt checks exactly this path.
+if(NOT EXISTS "${POINTCLOUD_DIR}/lib/libpc.a")
+    message(FATAL_ERROR
+        "pgPointCloud enabler failed: ${POINTCLOUD_DIR}/lib/libpc.a "
+        "was not produced by the libpc.a make target.")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
@@ -26,19 +171,30 @@ vcpkg_cmake_configure(
         # the GEOS C++ API, which the arm64-linux vcpkg triplet does not carry.
         -DBUILD_TESTING=OFF
         # Build the optional spatial type families that MobilityDuck ports
-        # (tcbuffer, tnpoint, tpose, trgeometry). RGEO depends on POSE.
+        # (tcbuffer, tnpoint, tpose, trgeometry). RGEO depends on POSE. The
+        # pgPointCloud temporal types (tpcpoint / tpcpatch) need POINTCLOUD.
         -DCBUFFER=ON
         -DNPOINT=ON
         -DPOSE=ON
         -DRGEO=ON
+        -DPOINTCLOUD=ON
         -DCMAKE_C_FLAGS="-Dsession_timezone=meos_session_timezone"
         -DCMAKE_CXX_FLAGS="-Dsession_timezone=meos_session_timezone"
-
 )
 
 vcpkg_cmake_build(TARGET all)
 vcpkg_cmake_install()
 
+# meos/src/pointcloud/CMakeLists.txt links libpc.a into the `pointcloud`
+# OBJECT library as a usage requirement only: the static libmeos.a does not
+# absorb libpc.a's objects nor carry a link interface, so a consumer linking
+# libmeos.a sees unresolved pc_point_get_x/y/z/... . Install libpc.a alongside
+# libmeos.a and propagate it (+ libxml2 / zlib) through MEOS::meos's
+# INTERFACE_LINK_LIBRARIES so the extension link resolves the pgPointCloud
+# symbols.
+file(INSTALL "${SOURCE_PATH}/pointcloud-pg/lib/libpc.a"
+     DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/meos")
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/meos/MEOSConfig.cmake" [=[
 # Minimal imported target for MEOS
@@ -63,6 +219,31 @@ if (NOT TARGET MEOS::meos)
     IMPORTED_LOCATION "${_meos_lib}"
     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/../../include"
   )
+  # When MEOS was built with -DPOINTCLOUD=ON, libmeos.a calls into the
+  # pgPointCloud archive libpc.a (and libxml2 / zlib). The static libmeos.a
+  # does not carry that link interface, so propagate it here.
+  set(_meos_libdir "${CMAKE_CURRENT_LIST_DIR}/../../lib")
+  if (EXISTS "${_meos_libdir}/libpc.a")
+    set(_meos_pc_iface "${_meos_libdir}/libpc.a")
+    file(GLOB _meos_xml2 "${_meos_libdir}/libxml2.a" "${_meos_libdir}/libxml2.lib")
+    file(GLOB _meos_zlib "${_meos_libdir}/libz.a" "${_meos_libdir}/libzlib.a" "${_meos_libdir}/zlib.lib")
+    if (_meos_xml2)
+      list(APPEND _meos_pc_iface ${_meos_xml2})
+    endif()
+    if (_meos_zlib)
+      list(APPEND _meos_pc_iface ${_meos_zlib})
+    endif()
+    # libxml2 uses iconv for charset conversion. On Linux iconv lives in libc,
+    # but on macOS it is a separate system library (libiconv), so the final
+    # link otherwise fails with "Undefined symbols: _iconv/_iconv_open/
+    # _iconv_close for architecture x86_64".
+    if (APPLE)
+      list(APPEND _meos_pc_iface "-liconv")
+    endif()
+    set_target_properties(MEOS::meos PROPERTIES
+      INTERFACE_LINK_LIBRARIES "${_meos_pc_iface}"
+    )
+  endif()
 endif()
 ]=])
 

vcpkg_ports/meos/vcpkg.json

@@ -1,7 +1,7 @@
 {
     "name": "meos",
     "version-string": "git",
-    "port-version": 1,
+    "port-version": 2,
     "description": "MEOS - Mobility Engine Open Source C library (built from MobilityDB with -DMEOS=ON)",
     "homepage": "https://libmeos.org/",
     "dependencies": [
@@ -10,6 +10,8 @@
       "geos",
       "proj",
       "json-c",
-      "gsl"
+      "gsl",
+      "libxml2",
+      "zlib"
     ]
-  }
+  }