Attachment 239890 Details for Bug 260402 – Refresh Patch for CMake-ification

[patch] Refresh Patch for CMake-ification

re2-20230201.patch (text/plain), 4.69 KB, created by Daniel Engberg on 2023-02-03 22:06:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-02-03 22:06:11 UTC

Size: 4.69 KB

patch

obsolete

>diff --git a/devel/re2/Makefile b/devel/re2/Makefile
>index afef5cea0035..d0da020440d3 100644
>--- a/devel/re2/Makefile
>+++ b/devel/re2/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	re2
>-PORTVERSION=	20220601
>+DISTVERSION=	20230201
> CATEGORIES=	devel
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -9,18 +9,21 @@ WWW=		https://github.com/google/re2
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		compiler:c++11-lang gmake pathfix
>-
>-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" SED_INPLACE="${SED} -i ''" prefix=${PREFIX}
>+USES=		cmake compiler:c++11-lang pathfix
> USE_LDCONFIG=	yes
> 
>-PATHFIX_MAKEFILEIN=	Makefile
>-
> GH_ACCOUNT=	google
>-GH_TAGNAME=	${PORTVERSION:C|(....)(..)(..)|\1-\2-\3|}
>+GH_TAGNAME=	${DISTVERSION:C|(....)(..)(..)|\1-\2-\3|}
> USE_GITHUB=	yes
> 
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so
>+TEST_TARGET=	test
>+
>+CMAKE_ON=	BUILD_SHARED_LIBS
>+
>+OPTIONS_DEFINE=	TEST
>+
>+TEST_LIB_DEPENDS=	libpcre.so:devel/pcre
>+TEST_USES=		pkgconfig
>+TEST_CMAKE_BOOL=	RE2_BUILD_TESTING USEPCRE
> 
> .include <bsd.port.mk>
>diff --git a/devel/re2/distinfo b/devel/re2/distinfo
>index adca7297d10b..c2c9b3b50d7d 100644
>--- a/devel/re2/distinfo
>+++ b/devel/re2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1654275845
>-SHA256 (google-re2-20220601-2022-06-01_GH0.tar.gz) = f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f
>-SIZE (google-re2-20220601-2022-06-01_GH0.tar.gz) = 381032
>+TIMESTAMP = 1675458030
>+SHA256 (google-re2-20230201-2023-02-01_GH0.tar.gz) = cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde
>+SIZE (google-re2-20230201-2023-02-01_GH0.tar.gz) = 382814
>diff --git a/devel/re2/files/patch-CMakeLists.txt b/devel/re2/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..e02045dc3f7b
>--- /dev/null
>+++ b/devel/re2/files/patch-CMakeLists.txt
>@@ -0,0 +1,60 @@
>+--- CMakeLists.txt.orig	2023-02-03 21:24:21 UTC
>++++ CMakeLists.txt
>+@@ -64,7 +64,9 @@ endif()
>+ 
>+ if(USEPCRE)
>+   add_definitions(-DUSEPCRE)
>+-  list(APPEND EXTRA_TARGET_LINK_LIBRARIES pcre)
>++  find_package(PkgConfig REQUIRED)
>++  pkg_check_modules(_pcre REQUIRED libpcre)
>++  list(APPEND EXTRA_TARGET_LINK_LIBRARIES ${_pcre_LINK_LIBRARIES})
>+ endif()
>+ 
>+ set(RE2_SOURCES
>+@@ -94,9 +96,13 @@ set(RE2_SOURCES
>+     )
>+ 
>+ add_library(re2 ${RE2_SOURCES})
>++add_library(re2_static STATIC ${RE2_SOURCES})
>+ target_compile_features(re2 PUBLIC cxx_std_11)
>+ 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})
>+ 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(UNIX)
>+@@ -122,6 +128,7 @@ if(RE2_BUILD_TESTING)
>+   add_library(testing STATIC ${TESTING_SOURCES})
>+   target_compile_features(testing PUBLIC cxx_std_11)
>+   target_link_libraries(testing PUBLIC re2)
>++  target_include_directories(testing PRIVATE ${_pcre_INCLUDE_DIRS})
>+ 
>+   set(TEST_TARGETS
>+       charclass_test
>+@@ -155,6 +162,7 @@ if(RE2_BUILD_TESTING)
>+     add_executable(${target} re2/testing/${target}.cc util/test.cc)
>+     target_compile_features(${target} PUBLIC cxx_std_11)
>+     target_link_libraries(${target} testing ${EXTRA_TARGET_LINK_LIBRARIES})
>++    target_include_directories(${target} PRIVATE ${_pcre_INCLUDE_DIRS})
>+     add_test(NAME ${target} COMMAND ${target})
>+   endforeach()
>+ 
>+@@ -162,6 +170,7 @@ if(RE2_BUILD_TESTING)
>+     add_executable(${target} re2/testing/${target}.cc util/benchmark.cc)
>+     target_compile_features(${target} PUBLIC cxx_std_11)
>+     target_link_libraries(${target} testing ${EXTRA_TARGET_LINK_LIBRARIES})
>++    target_include_directories(${target} PRIVATE ${_pcre_INCLUDE_DIRS})
>+   endforeach()
>+ endif()
>+ 
>+@@ -180,6 +189,8 @@ install(TARGETS re2
>+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
>+         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 410f894cf70c..d9f64aae4759 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.9
>-lib/libre2.so.9.0.0
>+lib/libre2.so.10
>+lib/libre2.so.10.0.0
> libdata/pkgconfig/re2.pc

Actions: View | Diff

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