Attachment #242859 for bug #260402




PORTNAME=	re2
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

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libabsl_base.so:devel/abseil

USES=		cmake compiler:c++17-lang localbase:ldflags pathfix pkgconfig
USE_CXXSTD=	c++17
USE_LDCONFIG=	yes

CMAKE_ON=	BUILD_SHARED_LIBS

OPTIONS_DEFINE=	TEST
GH_TAGNAME=	${PORTVERSION:C|(....)(..)(..)|\1-\2-\3|}
USE_GITHUB=	yes

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>

Lines 1-3 Link Here

(-)b/devel/re2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1678206641	1	TIMESTAMP = 1685798690
2	SHA256 (google-re2-20230301-2023-03-01_GH0.tar.gz) = 7a9a4824958586980926a300b4717202485c4b4115ac031822e29aa4ef207e48	2	SHA256 (re2-2023-06-02.tar.gz) = 4ccdd5aafaa1bcc24181e6dd3581c3eee0354734bb9f3cb4306273ffa434b94f
3	SIZE (google-re2-20230301-2023-03-01_GH0.tar.gz) = 383282	3	SIZE (re2-2023-06-02.tar.gz) = 396296




--- 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::)
@

Lines 2-9 include/re2/filtered_re2.h Link Here

(-)b/devel/re2/pkg-plist (-2 / +6 lines)
2	include/re2/re2.h	2	include/re2/re2.h
3	include/re2/set.h	3	include/re2/set.h
4	include/re2/stringpiece.h	4	include/re2/stringpiece.h
		5	lib/cmake/re2/re2Config.cmake
		6	lib/cmake/re2/re2ConfigVersion.cmake
		7	lib/cmake/re2/re2Targets-%%CMAKE_BUILD_TYPE%%.cmake
		8	lib/cmake/re2/re2Targets.cmake
5	lib/libre2.a	9	lib/libre2.a
6	lib/libre2.so	10	lib/libre2.so
7	lib/libre2.so.10	11	lib/libre2.so.11
8	lib/libre2.so.10.0.0	12	lib/libre2.so.11.0.0
9	libdata/pkgconfig/re2.pc	13	libdata/pkgconfig/re2.pc

Return to bug 260402

Lines 1-6 Link Here

(-)b/devel/re2/Makefile (-9 / +14 lines)
1	PORTNAME= re2	1	PORTNAME= re2
2	PORTVERSION= 20230301	2	DISTVERSION= 20230602
3	CATEGORIES= devel	3	CATEGORIES= devel
		4	MASTER_SITES= https://github.com/google/re2/releases/download/${DISTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}/
		5	DISTNAME= ${PORTNAME}-${DISTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}
4		6
5	MAINTAINER= sunpoet@FreeBSD.org	7	MAINTAINER= sunpoet@FreeBSD.org
6	COMMENT= Fast C++ regex library	8	COMMENT= Fast C++ regex library
Lines 9-26 WWW= https://github.com/google/re2 Link Here
9	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
10	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
11		13
12	USES= compiler:c++11-lang gmake pathfix	14	LIB_DEPENDS= libabsl_base.so:devel/abseil
13		15
14	MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}	16	USES= cmake compiler:c++17-lang localbase:ldflags pathfix pkgconfig
		17	USE_CXXSTD= c++17
15	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
16		19
17	PATHFIX_MAKEFILEIN= Makefile	20	CMAKE_ON= BUILD_SHARED_LIBS
18		21
19	GH_ACCOUNT= google	22	OPTIONS_DEFINE= TEST
20	GH_TAGNAME= ${PORTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}
21	USE_GITHUB= yes
22		23
23	post-install:	24	TEST_BUILD_DEPENDS= ${LOCALBASE}/lib/libbenchmark.so:devel/benchmark \
24	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so	25	${LOCALBASE}/lib/libgtest.so:devel/googletest \
		26	${LOCALBASE}/lib/libpcre.so:devel/pcre
		27	TEST_USES= pkgconfig
		28	TEST_TEST_TARGET= test
		29	TEST_CMAKE_BOOL= RE2_BUILD_TESTING USEPCRE
25		30
26	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Added Link Here

(-)b/devel/re2/files/patch-CMakeLists.txt (+29 lines)
1	--- CMakeLists.txt.orig 2023-06-03 13:33:46 UTC
2	+++ CMakeLists.txt
3	@@ -135,12 +135,16 @@ set(RE2_HEADERS
4	)
5
6	add_library(re2 ${RE2_SOURCES})
7	+add_library(re2_static STATIC ${RE2_SOURCES})
8	target_compile_features(re2 PUBLIC cxx_std_14)
9	target_include_directories(re2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
10	+target_include_directories(re2 PRIVATE ${CMAKE_SOURCE_DIR})
11	+target_include_directories(re2_static PRIVATE ${CMAKE_SOURCE_DIR})
12	# CMake gives "set_target_properties called with incorrect number of arguments."
13	# errors if we don't quote ${RE2_HEADERS}, so quote it despite prevailing style.
14	set_target_properties(re2 PROPERTIES PUBLIC_HEADER "${RE2_HEADERS}")
15	set_target_properties(re2 PROPERTIES SOVERSION ${SONAME} VERSION ${SONAME}.0.0)
16	+set_target_properties(re2_static PROPERTIES OUTPUT_NAME "re2")
17	add_library(re2::re2 ALIAS re2)
18
19	if(APPLE AND RE2_BUILD_FRAMEWORK)
20	@@ -245,6 +249,8 @@ install(TARGETS re2
21	FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
22	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/re2
23	INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
24	+install(TARGETS re2_static
25	+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
26	install(EXPORT re2Targets
27	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re2
28	NAMESPACE re2::)
29	@