Attachment 222167 Details for Bug 253255 – Patch for re v2

[patch] Patch for re v2

0001-re2-2.patch (text/plain), 4.43 KB, created by Daniel Engberg on 2021-02-04 19:54:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-02-04 19:54:40 UTC

Size: 4.43 KB

patch

obsolete

>From 334032bc71b4f3c6e8a035d32aafeafde17592d6 Mon Sep 17 00:00:00 2001
>From: Daniel Engberg <daniel.engberg.lists@pyret.net>
>Date: Thu, 4 Feb 2021 20:53:09 +0100
>Subject: [PATCH] re2-2
>
>re2-2
>
>Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
>---
> devel/re2/Makefile                   | 15 +++++------
> devel/re2/distinfo                   |  6 ++---
> devel/re2/files/patch-CMakeLists.txt | 39 ++++++++++++++++++++++++++++
> devel/re2/pkg-plist                  |  7 ++---
> 4 files changed, 53 insertions(+), 14 deletions(-)
> create mode 100644 devel/re2/files/patch-CMakeLists.txt
>
>diff --git a/devel/re2/Makefile b/devel/re2/Makefile
>index db05abb499c4..882a1cd3a830 100644
>--- a/devel/re2/Makefile
>+++ b/devel/re2/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	re2
>-PORTVERSION=	20210201
>+DISTVERSION=	20210202
> CATEGORIES=	devel
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -11,18 +11,17 @@ COMMENT=	Fast C++ regex library
> 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 pkgconfig
> 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
> 
>+CMAKE_ON=	BUILD_SHARED_LIBS
>+CMAKE_OFF=	RE2_BUILD_TESTING
>+
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libre2.so
>+	@${CP} -a ${INSTALL_WRKSRC}/libre2.so.* ${STAGEDIR}${PREFIX}/lib/
> 
> .include <bsd.port.mk>
>diff --git a/devel/re2/distinfo b/devel/re2/distinfo
>index a82dcf0ca6ad..5d13b4d7700e 100644
>--- a/devel/re2/distinfo
>+++ b/devel/re2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1612296107
>-SHA256 (google-re2-20210201-2021-02-01_GH0.tar.gz) = d3e15031ced791b39f11964816ca2d4213f25d3b67fbbe82972c7b7666c456ba
>-SIZE (google-re2-20210201-2021-02-01_GH0.tar.gz) = 403036
>+TIMESTAMP = 1612466789
>+SHA256 (google-re2-20210202-2021-02-02_GH0.tar.gz) = 1396ab50c06c1a8885fb68bf49a5ecfd989163015fd96699a180d6414937f33f
>+SIZE (google-re2-20210202-2021-02-02_GH0.tar.gz) = 402958
>diff --git a/devel/re2/files/patch-CMakeLists.txt b/devel/re2/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..edcf15b6bc8b
>--- /dev/null
>+++ b/devel/re2/files/patch-CMakeLists.txt
>@@ -0,0 +1,39 @@
>+--- CMakeLists.txt.orig	2021-02-02 00:24:20 UTC
>++++ CMakeLists.txt
>+@@ -1,3 +1,4 @@
>++
>+ # Copyright 2015 The RE2 Authors.  All Rights Reserved.
>+ # Use of this source code is governed by a BSD-style
>+ # license that can be found in the LICENSE file.
>+@@ -147,12 +148,29 @@ set(RE2_HEADERS
>+     re2/stringpiece.h
>+     )
>+ 
>++macro(extract_version file setting_name)
>++  file(STRINGS ${file} VERSION_NUMBER REGEX "^${setting_name}")
>++  string(REPLACE "=" ";" VERSION_NUMBER_LIST ${VERSION_NUMBER})
>++  list(GET VERSION_NUMBER_LIST 1 ${setting_name})
>++endmacro(extract_version)
>++
>++extract_version(Makefile SONAME)
>++
>++set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
>++set(libdir     ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
>++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/re2.pc ${CMAKE_CURRENT_BINARY_DIR}/re2.pc @ONLY)
>++
>+ install(FILES ${RE2_HEADERS}
>+         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/re2)
>+-install(TARGETS re2 EXPORT re2Config
>++install(TARGETS re2 EXPORT re2-config
>+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
>+         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
>+-install(EXPORT re2Config
>++install(EXPORT re2-config
>+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re2 NAMESPACE re2::)
>++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/re2.pc
>++	DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
>++ADD_CUSTOM_TARGET(install_files ALL
>++	COMMAND ${CMAKE_COMMAND} -E create_symlink libre2.so libre2.so.${SONAME}
>++	COMMAND ${CMAKE_COMMAND} -E create_symlink libre2.so libre2.so.${SONAME}.0.0)
>diff --git a/devel/re2/pkg-plist b/devel/re2/pkg-plist
>index 473a3aec6358..6bdeb9956cea 100644
>--- a/devel/re2/pkg-plist
>+++ b/devel/re2/pkg-plist
>@@ -2,8 +2,9 @@ include/re2/filtered_re2.h
> include/re2/re2.h
> include/re2/set.h
> include/re2/stringpiece.h
>-lib/libre2.a
>+lib/cmake/re2/re2-config-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/re2/re2-config.cmake
> lib/libre2.so
>-lib/libre2.so.10
>-lib/libre2.so.10.0.0
>+lib/libre2.so.9
>+lib/libre2.so.9.0.0
> libdata/pkgconfig/re2.pc
>-- 
>2.30.0
>

Actions: View | Diff

Attachments on bug 253255: 222166 | 222167