From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F1D6B138330 for ; Wed, 14 Sep 2016 17:18:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CF1BE0A41; Wed, 14 Sep 2016 17:18:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A380E0A41 for ; Wed, 14 Sep 2016 17:18:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 016763404A5 for ; Wed, 14 Sep 2016 17:18:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF7D4247A for ; Wed, 14 Sep 2016 17:18:08 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1473873485.b5e162a25ad978e858eb518406b30433c2602e8f.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/re2/files/0.2016.05.01-pkgconfig.patch X-VCS-Directories: dev-libs/re2/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b5e162a25ad978e858eb518406b30433c2602e8f X-VCS-Branch: master Date: Wed, 14 Sep 2016 17:18:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c8d718cc-fafc-48ac-bb31-a77406df8a4a X-Archives-Hash: 66398fff41bcc45ce1ecf2568bb8ad1f commit: b5e162a25ad978e858eb518406b30433c2602e8f Author: Mike Gilbert gentoo org> AuthorDate: Wed Sep 14 17:17:47 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Sep 14 17:18:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e162a2 dev-libs/re2: use pkgconfig patch from upstream Package-Manager: portage-2.3.0_p24 dev-libs/re2/files/0.2016.05.01-pkgconfig.patch | 58 +++++++++++++++---------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch b/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch index e4148a6..46ec7ca 100644 --- a/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch +++ b/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch @@ -1,47 +1,57 @@ -From 7dc941862819398db2ac4ae4239c8ed05431f928 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 8 May 2016 11:54:00 -0400 -Subject: [PATCH] Substitute includedir and libdir in re2.pc +From ac62674fa16b5a086f02dd208667ba65e22ec09d Mon Sep 17 00:00:00 2001 +From: Paul Wankadia +Date: Mon, 9 May 2016 14:42:37 +1000 +Subject: [PATCH] Plumb more variables from Makefile to re2.pc. +Change-Id: I35509c273b0bd90242db127121c71be1f628c06f +Reviewed-on: https://code-review.googlesource.com/4710 +Reviewed-by: Paul Wankadia --- - Makefile | 5 ++++- - re2.pc => re2.pc.in | 5 ++--- - 2 files changed, 6 insertions(+), 4 deletions(-) - rename re2.pc => re2.pc.in (71%) + Makefile | 8 +++++--- + re2.pc | 6 +++--- + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index d0e2090..4a8d8a6 100644 +index d0e2090..411e551 100644 --- a/Makefile +++ b/Makefile -@@ -273,7 +273,10 @@ install: obj/libre2.a obj/so/libre2.$(SOEXT) +@@ -28,11 +28,9 @@ NMFLAGS?=-p + # http://www.gnu.org/prep/standards/standards.html + prefix=/usr/local + exec_prefix=$(prefix) +-bindir=$(exec_prefix)/bin + includedir=$(prefix)/include + libdir=$(exec_prefix)/lib + INSTALL=install +-INSTALL_PROGRAM=$(INSTALL) + INSTALL_DATA=$(INSTALL) -m 644 + + # ABI version +@@ -273,7 +271,11 @@ install: obj/libre2.a obj/so/libre2.$(SOEXT) $(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER00) ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER) ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT) - sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdir)/pkgconfig/re2.pc -+ sed -e "s#@prefix@#$(prefix)#" \ -+ -e "s#@includedir@#$(includedir)#" \ -+ -e "s#@libdir@#$(libdir)#" \ -+ re2.pc.in >$(DESTDIR)$(libdir)/pkgconfig/re2.pc ++ $(INSTALL_DATA) re2.pc $(DESTDIR)$(libdir)/pkgconfig/re2.pc ++ sed -i \ ++ -e "s#@prefix@#${prefix}#" -e "s#@exec_prefix@#${exec_prefix}#" \ ++ -e "s#@includedir@#${includedir}#" -e "s#@libdir@#${libdir}#" \ ++ $(DESTDIR)$(libdir)/pkgconfig/re2.pc testinstall: static-testinstall shared-testinstall @echo -diff --git a/re2.pc b/re2.pc.in -similarity index 71% -rename from re2.pc -rename to re2.pc.in -index 91ba181..a04a70a 100644 +diff --git a/re2.pc b/re2.pc +index 91ba181..d66cf51 100644 --- a/re2.pc -+++ b/re2.pc.in -@@ -1,7 +1,6 @@ ++++ b/re2.pc +@@ -1,7 +1,7 @@ prefix=@prefix@ -exec_prefix=${prefix} -includedir=${prefix}/include -libdir=${exec_prefix}/lib ++exec_prefix=@exec_prefix@ +includedir=@includedir@ +libdir=@libdir@ Name: re2 Description: RE2 is a fast, safe, thread-friendly regular expression engine. --- -2.8.2 -