Attachment 242859 Details for Bug 260402 – Patch for re2

[patch] Patch for re2

re2-20230602v2.patch (text/plain), 3.94 KB, created by Daniel Engberg on 2023-06-18 07:50:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-06-18 07:50:30 UTC

Size: 3.94 KB

patch

obsolete

>diff --git a/devel/re2/Makefile b/devel/re2/Makefile
>index fc4bf0862cc2..036beda0c095 100644
>--- a/devel/re2/Makefile
>+++ b/devel/re2/Makefile
>@@ -1,6 +1,8 @@
> PORTNAME=	re2
>-PORTVERSION=	20230301
>+DISTVERSION=	20230602
> CATEGORIES=	devel
>+MASTER_SITES=	https://github.com/google/re2/releases/download/${DISTVERSION:C|(....)(..)(..)|\1-\2-\3|}/
>+DISTNAME=	${PORTNAME}-${DISTVERSION:C|(....)(..)(..)|\1-\2-\3|}
> 
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	Fast C++ regex library
>@@ -9,18 +11,21 @@ WWW=		https://github.com/google/re2
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		compiler:c++11-lang gmake pathfix
>+LIB_DEPENDS=	libabsl_base.so:devel/abseil
> 
>-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}
>+USES=		cmake compiler:c++17-lang localbase:ldflags pathfix pkgconfig
>+USE_CXXSTD=	c++17
> USE_LDCONFIG=	yes
> 
>-PATHFIX_MAKEFILEIN=	Makefile
>+CMAKE_ON=	BUILD_SHARED_LIBS
> 
>-GH_ACCOUNT=	google
>-GH_TAGNAME=	${PORTVERSION:C|(....)(..)(..)|\1-\2-\3|}
>-USE_GITHUB=	yes
>+OPTIONS_DEFINE=	TEST
> 
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so
>+TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/libbenchmark.so:devel/benchmark \
>+			${LOCALBASE}/lib/libgtest.so:devel/googletest \
>+			${LOCALBASE}/lib/libpcre.so:devel/pcre
>+TEST_USES=		pkgconfig
>+TEST_TEST_TARGET=	test
>+TEST_CMAKE_BOOL=	RE2_BUILD_TESTING USEPCRE
> 
> .include <bsd.port.mk>
>diff --git a/devel/re2/distinfo b/devel/re2/distinfo
>index 2cb11642d052..170a3c1de4a4 100644
>--- a/devel/re2/distinfo
>+++ b/devel/re2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1678206641
>-SHA256 (google-re2-20230301-2023-03-01_GH0.tar.gz) = 7a9a4824958586980926a300b4717202485c4b4115ac031822e29aa4ef207e48
>-SIZE (google-re2-20230301-2023-03-01_GH0.tar.gz) = 383282
>+TIMESTAMP = 1685798690
>+SHA256 (re2-2023-06-02.tar.gz) = 4ccdd5aafaa1bcc24181e6dd3581c3eee0354734bb9f3cb4306273ffa434b94f
>+SIZE (re2-2023-06-02.tar.gz) = 396296
>diff --git a/devel/re2/files/patch-CMakeLists.txt b/devel/re2/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..0314df57b0d3
>--- /dev/null
>+++ b/devel/re2/files/patch-CMakeLists.txt
>@@ -0,0 +1,29 @@
>+--- CMakeLists.txt.orig	2023-06-03 13:33:46 UTC
>++++ CMakeLists.txt
>+@@ -135,12 +135,16 @@ set(RE2_HEADERS
>+     )
>+ 
>+ add_library(re2 ${RE2_SOURCES})
>++add_library(re2_static STATIC ${RE2_SOURCES})
>+ target_compile_features(re2 PUBLIC cxx_std_14)
>+ target_include_directories(re2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
>++target_include_directories(re2 PRIVATE ${CMAKE_SOURCE_DIR})
>++target_include_directories(re2_static PRIVATE ${CMAKE_SOURCE_DIR})
>+ # CMake gives "set_target_properties called with incorrect number of arguments."
>+ # errors if we don't quote ${RE2_HEADERS}, so quote it despite prevailing style.
>+ set_target_properties(re2 PROPERTIES PUBLIC_HEADER "${RE2_HEADERS}")
>+ set_target_properties(re2 PROPERTIES SOVERSION ${SONAME} VERSION ${SONAME}.0.0)
>++set_target_properties(re2_static PROPERTIES OUTPUT_NAME "re2")
>+ add_library(re2::re2 ALIAS re2)
>+ 
>+ if(APPLE AND RE2_BUILD_FRAMEWORK)
>+@@ -245,6 +249,8 @@ install(TARGETS re2
>+         FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/re2
>+         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
>++install(TARGETS re2_static
>++	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
>+ install(EXPORT re2Targets
>+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re2
>+         NAMESPACE re2::)
>+@
>diff --git a/devel/re2/pkg-plist b/devel/re2/pkg-plist
>index 473a3aec6358..98704097e25c 100644
>--- a/devel/re2/pkg-plist
>+++ b/devel/re2/pkg-plist
>@@ -2,8 +2,12 @@ include/re2/filtered_re2.h
> include/re2/re2.h
> include/re2/set.h
> include/re2/stringpiece.h
>+lib/cmake/re2/re2Config.cmake
>+lib/cmake/re2/re2ConfigVersion.cmake
>+lib/cmake/re2/re2Targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/re2/re2Targets.cmake
> lib/libre2.a
> lib/libre2.so
>-lib/libre2.so.10
>-lib/libre2.so.10.0.0
>+lib/libre2.so.11
>+lib/libre2.so.11.0.0
> libdata/pkgconfig/re2.pc

Actions: View | Diff

Attachments on bug 260402: 230092 | 230093 | 233454 | 233482 | 233484 | 234102 | 238046 | 239890 | 242859