From patchwork Tue Dec 11 01:14:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 427 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8E5EE168FB; Tue, 11 Dec 2018 01:30:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id C872A168F5 for ; Tue, 11 Dec 2018 01:30:07 +0000 (GMT) Received: from localhost ([::1]:35439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWWsB-0007qB-39 for patchwork@mira.cbaines.net; Mon, 10 Dec 2018 20:30:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWWr5-0006tS-Mq for guix-patches@gnu.org; Mon, 10 Dec 2018 20:29:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWWdk-0001HW-I8 for guix-patches@gnu.org; Mon, 10 Dec 2018 20:15:13 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:38242) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWWdk-0001HK-CQ for guix-patches@gnu.org; Mon, 10 Dec 2018 20:15:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gWWdk-0001Rg-66 for guix-patches@gnu.org; Mon, 10 Dec 2018 20:15:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33701] [PATCH staging 15/23] gnu: nghttp2: Update to 1.35.1. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Dec 2018 01:15:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33701@debbugs.gnu.org Received: via spool by 33701-submit@debbugs.gnu.org id=B33701.15444908995334 (code B ref 33701); Tue, 11 Dec 2018 01:15:12 +0000 Received: (at 33701) by debbugs.gnu.org; 11 Dec 2018 01:14:59 +0000 Received: from localhost ([127.0.0.1]:42463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWWdW-0001Nw-WE for submit@debbugs.gnu.org; Mon, 10 Dec 2018 20:14:59 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gWWdK-0001M3-OL for 33701@debbugs.gnu.org; Mon, 10 Dec 2018 20:14:46 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id AEE1921C6B for <33701@debbugs.gnu.org>; Mon, 10 Dec 2018 20:14:41 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 10 Dec 2018 20:14:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=91htqeHdjaGzD 6s9Tnyh6agDHzDKajkcXtNscxopGZk=; b=Ku19G59ZvkQPJXMPAaQCpWkN+8AUm WhRAcJmyn/pOVECoKo8IIIz6yzNh2JXxD2vjVKNucmPN/rfINF1bvNLqqTYvj1QW IAkCQkjmpzj8yhs40nPGwM+K2GRBM5hEHx26enckHAilG/1F8oFbAP3ekzqUWcBO mJoPmvHIbSGrS4xaFsfydbq5OtH0USlhGJpsF05Y9iEvpvVFJQIuoRE9ioNdPVaH 5M1PspUnVShFxkl522uoHqueGpKqaJnz969aUwz+Ii0GP4eWxFQLo8+zYZ1I/+gV NvrXiVPEDzGOwduQiA0vRsLKwEALpXLtY9AOakzazs5HEHHNdpvo5/1BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=91htqeHdjaGzD6s9Tnyh6agDHzDKajkcXtNscxopGZk=; b=GQ2fImhX Yhf37ML/2aznjmuCwjsBWTTdYiqNXV+B5xfS6F0FGBhNsslZmoZw211uajrpMC7c 2o0SjjhyLfWpRwIxrAJEI6MTC9cD6LbtF8pU7WdEP8JxRW1C2wPJUSuldowoiy4r QQBVXAFqZ0RFGGWFeziYmgZbd9PaCzsboVyyhooVLgwNMWWacZ8XCwD6W01uj80+ 7AjFnEcPIoDGNFIfdj+VC6lUKjYHO3wxEQ2qjbZuqVz3O4xsYUhR8gAXfMSroMP7 mFA+IRdaNihwclO0Qqw3ybE6IplST4y2QWqUGtBWqdB6ajv7tssqIZ+9fkTFlSxp wZigTWRbiQLuPQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudegiedgfedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpe forghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeen ucffohhmrghinhepghhnuhdrohhrghenucfkphepiedvrdduiedrvddviedrudegtdenuc frrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomhen ucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 10BC1E4430 for <33701@debbugs.gnu.org>; Mon, 10 Dec 2018 20:14:40 -0500 (EST) From: Marius Bakke Date: Tue, 11 Dec 2018 02:14:08 +0100 Message-Id: <20181211011416.15902-15-mbakke@fastmail.com> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211011416.15902-1-mbakke@fastmail.com> References: <20181211011416.15902-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (nghttp2): Update to 1.35.1. [native-inputs]: Add GCC-7. [arguments]: Add workaround for . --- gnu/packages/web.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index caf56e4119..17deb5c222 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -79,6 +79,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages kerberos) + #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -6696,7 +6697,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.32.0") + (version "1.35.1") (source (origin (method url-fetch) @@ -6705,12 +6706,13 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "0zbgp8f80h2zlfn8cd2ldrmgl81jzcdh1141n71aqmfckzaqj2kh")))) + "0fi6qg2w82636wixwkqy7bclpgxslmvg82r431hs8h6aqc4mnzwv")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 (native-inputs `(("pkg-config" ,pkg-config) + ("gcc" ,gcc-7) ; 1.35.0 requires GCC6 or later ;; Required by tests. ("cunit" ,cunit) @@ -6742,6 +6744,9 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (("@prefix@") (assoc-ref outputs "lib"))) #t)) + (add-before 'configure 'work-around-bug-30756 + (lambda _ + (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t)) (add-before 'check 'set-timezone-directory (lambda* (#:key inputs #:allow-other-keys) (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata")