Date: Sun, 9 Oct 2022 15:38:47 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6ba65f665d5e - main - databases/arrow: Fix b2b1773a8006931f49457a9341f2c6da6119de0e Message-ID: <202210091538.299FcltI041454@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ba65f665d5e1edf4e8867d72952c5515fe9ddce commit 6ba65f665d5e1edf4e8867d72952c5515fe9ddce Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-10-09 15:18:12 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-10-09 15:37:42 +0000 databases/arrow: Fix b2b1773a8006931f49457a9341f2c6da6119de0e It should be a PORTREVISION bump for shlib change of devel/grpc. Remove accidentally-committed local changes. --- databases/arrow/Makefile | 11 +---------- databases/arrow/pkg-plist | 14 +++----------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile index a5ca93052d42..ff17fdf15a9e 100644 --- a/databases/arrow/Makefile +++ b/databases/arrow/Makefile @@ -80,7 +80,7 @@ FLIGHT_LIB_DEPENDS= libgflags.so:devel/gflags \ libgrpc.so:devel/grpc \ libre2.so:devel/re2 FLIGHT_IMPLIES= IPC -#FLIGHT_BROKEN= configure breaks: Could not find a package configuration file provided by "re2" +FLIGHT_BROKEN= configure breaks: Could not find a package configuration file provided by "re2" GANDIVA_DESC= Gandiva libraries GANDIVA_USES= ssl @@ -90,7 +90,6 @@ GANDIVA_LIB_DEPENDS= libgrpc.so:devel/grpc \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 \ libutf8proc.so:textproc/utf8proc -#GANDIVA_BROKEN= llvm12 stage error (ln: /wrkdirs/usr/ports/devel/llvm12/work/stage/usr/local/llvm12/bin/clang: No such file or directory) HDFS_DESC= Arrow HDFS bridge HDFS_CMAKE_BOOL= ARROW_HDFS @@ -137,7 +136,6 @@ PLASMA_LIB_DEPENDS= libaws-c-auth.so:security/aws-c-auth \ libaws-c-sdkutils.so:devel/aws-c-sdkutils \ libaws-crt-cpp.so:devel/aws-crt-cpp \ libgflags.so:devel/gflags -#PLASMA_BROKEN= PLIST issue (Error: Orphaned: bin/ONplasma-store-server, Error: Missing: bin/plasma-store-server) BUILD_UTILITIES_DESC= build Arrow commandline utilities BUILD_UTILITIES_CMAKE_BOOL= ARROW_BUILD_UTILITIES @@ -213,19 +211,12 @@ pre-configure-PYTHON-on: @${MV} ${WRKSRC}/src/arrow/python/arrow-python.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}.pc.in @${MV} ${WRKSRC}/src/arrow/python/arrow-python-flight.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}-flight.pc.in -post-install-PLASMA-on: - -${MV} ${STAGEDIR}${PREFIX}/bin/ONplasma-store-server ${STAGEDIR}${PREFIX}/bin/plasma-store-server - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCOMPUTE} || ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA} PLIST_FILES+= lib/cmake/arrow/Findre2Alt.cmake .endif -.if ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA} -PLIST_FILES+= lib/cmake/arrow/FindgRPCAlt.cmake -.endif - .if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT" PLIST_SUB+= PYTHONFLIGHT="" .else diff --git a/databases/arrow/pkg-plist b/databases/arrow/pkg-plist index 2ef45cf28eaf..aa0ea34ded4f 100644 --- a/databases/arrow/pkg-plist +++ b/databases/arrow/pkg-plist @@ -106,19 +106,16 @@ include/arrow/extension_type.h %%FLIGHT%%include/arrow/flight/api.h %%FLIGHT%%include/arrow/flight/client.h %%FLIGHT%%include/arrow/flight/client_auth.h -%%FLIGHT%%include/arrow/flight/client_cookie_middleware.h %%FLIGHT%%include/arrow/flight/client_middleware.h +%%FLIGHT%%include/arrow/flight/customize_protobuf.h %%FLIGHT%%include/arrow/flight/middleware.h %%FLIGHT%%include/arrow/flight/pch.h %%FLIGHT%%include/arrow/flight/platform.h %%FLIGHT%%include/arrow/flight/server.h %%FLIGHT%%include/arrow/flight/server_auth.h %%FLIGHT%%include/arrow/flight/server_middleware.h -%%FLIGHT%%include/arrow/flight/test_definitions.h +%%FLIGHT%%include/arrow/flight/test_integration.h %%FLIGHT%%include/arrow/flight/test_util.h -%%FLIGHT%%include/arrow/flight/transport.h -%%FLIGHT%%include/arrow/flight/transport_server.h -%%FLIGHT%%include/arrow/flight/type_fwd.h %%FLIGHT%%include/arrow/flight/types.h %%FLIGHT%%include/arrow/flight/visibility.h include/arrow/io/api.h @@ -514,7 +511,6 @@ lib/cmake/arrow/ArrowTargets.cmake lib/cmake/arrow/FindArrow.cmake %%DATASET%%lib/cmake/arrow/FindArrowDataset.cmake %%FLIGHT%%lib/cmake/arrow/FindArrowFlight.cmake -%%FLIGHT%%lib/cmake/arrow/FindArrowFlightTesting.cmake %%PYTHON%%lib/cmake/arrow/FindArrowPython.cmake %%PYTHONFLIGHT%%lib/cmake/arrow/FindArrowPythonFlight.cmake %%TESTING%%lib/cmake/arrow/FindArrowTesting.cmake @@ -547,10 +543,7 @@ lib/libarrow.so.800.0.0 %%DATASET%%lib/libarrow_dataset.so.800.0.0 %%FLIGHT%%lib/libarrow_flight.so %%FLIGHT%%lib/libarrow_flight.so.800 -%%FLIGHT%%lib/libarrow_flight.so.800.0.0 -%%FLIGHT%%lib/libarrow_flight_testing.so -%%FLIGHT%%lib/libarrow_flight_testing.so.800 -%%FLIGHT%%lib/libarrow_flight_testing.so.800.0.0 +%%FLIGHT%%lib/libarrow_flight.so.800.8.0 %%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so %%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.800 %%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.800.0.0 @@ -574,7 +567,6 @@ lib/libarrow.so.800.0.0 %%DATASET%%libdata/pkgconfig/arrow-dataset.pc %%FILESYSTEM%%libdata/pkgconfig/arrow-filesystem.pc %%FLIGHT%%libdata/pkgconfig/arrow-flight.pc -%%FLIGHT%%libdata/pkgconfig/arrow-flight-testing.pc %%JSON%%libdata/pkgconfig/arrow-json.pc %%PYTHONFLIGHT%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%-flight.pc %%PYTHON%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210091538.299FcltI041454>