Attachment 223752 Details for Bug 254697 – Patch for re2

[patch] Patch for re2

0001-re2-20210401.patch (text/plain), 3.42 KB, created by Daniel Engberg on 2021-04-01 17:10:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-04-01 17:10:33 UTC

Size: 3.42 KB

patch

obsolete

>From b9fc64c452b5aa5e2bf0792e44800f9c22c30b2b Mon Sep 17 00:00:00 2001
>From: Daniel Engberg <daniel.engberg.lists@pyret.net>
>Date: Thu, 1 Apr 2021 18:52:10 +0200
>Subject: [PATCH] re2-20210401
>
>re2-20210401
>
>Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
>---
> devel/re2/Makefile                   | 13 ++++---------
> devel/re2/distinfo                   |  6 +++---
> devel/re2/files/patch-CMakeLists.txt | 19 +++++++++++++++++++
> devel/re2/pkg-plist                  |  3 ++-
> 4 files changed, 28 insertions(+), 13 deletions(-)
> create mode 100644 devel/re2/files/patch-CMakeLists.txt
>
>diff --git a/devel/re2/Makefile b/devel/re2/Makefile
>index e939cd15438a..f70ded2d70f2 100644
>--- a/devel/re2/Makefile
>+++ b/devel/re2/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	re2
>-PORTVERSION=	20210202
>-PORTREVISION=	1
>+PORTVERSION=	20210401
> CATEGORIES=	devel
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -12,18 +11,14 @@ 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
> 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
> 
> .include <bsd.port.mk>
>diff --git a/devel/re2/distinfo b/devel/re2/distinfo
>index 5d13b4d7700e..9a6a371d6afc 100644
>--- a/devel/re2/distinfo
>+++ b/devel/re2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1612466789
>-SHA256 (google-re2-20210202-2021-02-02_GH0.tar.gz) = 1396ab50c06c1a8885fb68bf49a5ecfd989163015fd96699a180d6414937f33f
>-SIZE (google-re2-20210202-2021-02-02_GH0.tar.gz) = 402958
>+TIMESTAMP = 1617294370
>+SHA256 (google-re2-20210401-2021-04-01_GH0.tar.gz) = 358aedf71dbf26506848905f5d4417b7adba5cf44d3bbcf70bf4ef68ccb0871e
>+SIZE (google-re2-20210401-2021-04-01_GH0.tar.gz) = 403354
>diff --git a/devel/re2/files/patch-CMakeLists.txt b/devel/re2/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..04fa5ed19b7d
>--- /dev/null
>+++ b/devel/re2/files/patch-CMakeLists.txt
>@@ -0,0 +1,19 @@
>+--- CMakeLists.txt.orig	2021-04-01 16:27:40 UTC
>++++ CMakeLists.txt
>+@@ -152,6 +152,10 @@ set(RE2_HEADERS
>+     re2/stringpiece.h
>+     )
>+ 
>++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
>+@@ -161,3 +165,5 @@ install(TARGETS re2 EXPORT re2Config
>+         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
>+ install(EXPORT re2Config
>+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/re2 NAMESPACE re2::)
>++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/re2.pc
>++	DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
>diff --git a/devel/re2/pkg-plist b/devel/re2/pkg-plist
>index 410f894cf70c..0276a82515e5 100644
>--- a/devel/re2/pkg-plist
>+++ b/devel/re2/pkg-plist
>@@ -2,7 +2,8 @@ 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_BUILD_TYPE%%.cmake
>+lib/cmake/re2/re2Config.cmake
> lib/libre2.so
> lib/libre2.so.9
> lib/libre2.so.9.0.0
>-- 
>2.30.1
>

Actions: View | Diff

Attachments on bug 254697: 223752