Attachment 234102 Details for Bug 260402 – patch

[patch] patch

re2.patch (text/plain), 2.59 KB, created by Yuri Victorovich on 2022-05-22 03:47:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2022-05-22 03:47:54 UTC

Size: 2.59 KB

patch

obsolete

>diff --git a/devel/re2/Makefile b/devel/re2/Makefile
>index d21fb245fecb..cce6cf99cfba 100644
>--- a/devel/re2/Makefile
>+++ b/devel/re2/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	re2
> PORTVERSION=	20220401
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -10,18 +11,23 @@ COMMENT=	Fast C++ regex library
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		compiler:c++11-lang gmake pathfix
>+BUILD_DEPENDS=	gmake:devel/gmake
> 
>-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}
>+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
> 
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so
>+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>
>diff --git a/devel/re2/pkg-plist b/devel/re2/pkg-plist
>index 410f894cf70c..6c18ea7ff8dc 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/libre2.a
>+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.so
> lib/libre2.so.9
> lib/libre2.so.9.0.0
>+lib/libre2_static.a
> libdata/pkgconfig/re2.pc
>diff --git a/devel/re2/files/patch-CMakeLists.txt b/devel/re2/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..dce59d196b7e
>--- /dev/null
>+++ b/devel/re2/files/patch-CMakeLists.txt
>@@ -0,0 +1,19 @@
>+--- 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}

Actions: View | Diff

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