Attachment #234102 for bug #260402





PORTNAME=	re2
PORTVERSION=	20220401
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	sunpoet@FreeBSD.org

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	gmake:devel/gmake

USES=		cmake:testing compiler:c++11-lang
USE_LDCONFIG=	yes

PATHFIX_MAKEFILEIN=	Makefile

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

CMAKE_ON=		BUILD_SHARED_LIBS
CMAKE_OFF=		RE2_BUILD_TESTING
CMAKE_TESTING_ON=	RE2_BUILD_TESTING

CXXFLAGS+=	-I${WRKSRC}

post-install: # install .pc file
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} libdir=${PREFIX}/libdata common-install
	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/re2.pc-e

.include <bsd.port.mk>

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

(-)b/devel/re2/pkg-plist (-1 / +5 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/libre2.a	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
6	lib/libre2.so	9	lib/libre2.so
7	lib/libre2.so.9	10	lib/libre2.so.9
8	lib/libre2.so.9.0.0	11	lib/libre2.so.9.0.0
		12	lib/libre2_static.a
9	libdata/pkgconfig/re2.pc	13	libdata/pkgconfig/re2.pc




--- CMakeLists.txt.orig	2022-05-22 03:40:08 UTC
+++ CMakeLists.txt
@@ -84,6 +84,7 @@ set(RE2_SOURCES
     )
 
 add_library(re2 ${RE2_SOURCES})
+add_library(re2_static STATIC ${RE2_SOURCES})
 target_include_directories(re2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 set_target_properties(re2 PROPERTIES SOVERSION ${SONAME} VERSION ${SONAME}.0.0)
 add_library(re2::re2 ALIAS re2)
@@ -156,7 +157,7 @@ set(RE2_HEADERS
 
 install(FILES ${RE2_HEADERS}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/re2)
-install(TARGETS re2 EXPORT re2Targets
+install(TARGETS re2 re2_static EXPORT re2Targets
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

Return to bug 260402

Lines 2-7 Link Here

(-)b/devel/re2/Makefile (-6 / +12 lines)
2		2
3	PORTNAME= re2	3	PORTNAME= re2
4	PORTVERSION= 20220401	4	PORTVERSION= 20220401
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6		7
7	MAINTAINER= sunpoet@FreeBSD.org	8	MAINTAINER= sunpoet@FreeBSD.org
Lines 10-27 COMMENT= Fast C++ regex library Link Here
10	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
11	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
12		13
13	USES= compiler:c++11-lang gmake pathfix	14	BUILD_DEPENDS= gmake:devel/gmake
14		15
15	MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}	16	USES= cmake:testing compiler:c++11-lang
16	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
17		18
18	PATHFIX_MAKEFILEIN= Makefile
19
20	GH_ACCOUNT= google	19	GH_ACCOUNT= google
21	GH_TAGNAME= ${PORTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}	20	GH_TAGNAME= ${PORTVERSION:C\|(....)(..)(..)\|\1-\2-\3\|}
22	USE_GITHUB= yes	21	USE_GITHUB= yes
23		22
24	post-install:	23	CMAKE_ON= BUILD_SHARED_LIBS
25	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so	24	CMAKE_OFF= RE2_BUILD_TESTING
		25	CMAKE_TESTING_ON= RE2_BUILD_TESTING
		26
		27	CXXFLAGS+= -I${WRKSRC}
		28
		29	post-install: # install .pc file
		30	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} libdir=${PREFIX}/libdata common-install
		31	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/re2.pc-e
26		32
27	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Added Link Here

(-)b/devel/re2/files/patch-CMakeLists.txt (+19 lines)
1	--- CMakeLists.txt.orig 2022-05-22 03:40:08 UTC
2	+++ CMakeLists.txt
3	@@ -84,6 +84,7 @@ set(RE2_SOURCES
4	)
5
6	add_library(re2 ${RE2_SOURCES})
7	+add_library(re2_static STATIC ${RE2_SOURCES})
8	target_include_directories(re2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
9	set_target_properties(re2 PROPERTIES SOVERSION ${SONAME} VERSION ${SONAME}.0.0)
10	add_library(re2::re2 ALIAS re2)
11	@@ -156,7 +157,7 @@ set(RE2_HEADERS
12
13	install(FILES ${RE2_HEADERS}
14	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/re2)
15	-install(TARGETS re2 EXPORT re2Targets
16	+install(TARGETS re2 re2_static EXPORT re2Targets
17	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
18	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
19	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}