From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7A1F713829C for ; Wed, 8 Jun 2016 23:12:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FE9B254021; Wed, 8 Jun 2016 23:12:32 +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 B3E45254021 for ; Wed, 8 Jun 2016 23:12:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 04641340D4A for ; Wed, 8 Jun 2016 23:12:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A70F7342 for ; Wed, 8 Jun 2016 23:12:24 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1465427671.4008e710e89f83f54d4b63a14ff301fe57f7b857.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/curl-7.49.1.ebuild X-VCS-Directories: net-misc/curl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 4008e710e89f83f54d4b63a14ff301fe57f7b857 X-VCS-Branch: master Date: Wed, 8 Jun 2016 23:12:24 +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: 5d91f1a5-b8fa-4bed-86b4-bb040a205799 X-Archives-Hash: f92fc08de45b3e7126a556df2b106e84 commit: 4008e710e89f83f54d4b63a14ff301fe57f7b857 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Jun 8 23:14:09 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Jun 8 23:14:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4008e710 net-misc/curl: make static build more robust See https://github.com/curl/curl/issues/864 Package-Manager: portage-2.2.28 net-misc/curl/curl-7.49.1.ebuild | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/net-misc/curl/curl-7.49.1.ebuild b/net-misc/curl/curl-7.49.1.ebuild index ccdbbd4..7f122a3 100644 --- a/net-misc/curl/curl-7.49.1.ebuild +++ b/net-misc/curl/curl-7.49.1.ebuild @@ -223,6 +223,27 @@ multilib_src_configure() { sed -i -e '/SUBDIRS/s:src::' Makefile || die sed -i -e '/SUBDIRS/s:scripts::' Makefile || die fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc } multilib_src_install_all() {