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 73F0F13832E for ; Wed, 10 Aug 2016 09:49:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 421EEE0B68; Wed, 10 Aug 2016 09:49:44 +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 C0079E0B68 for ; Wed, 10 Aug 2016 09:49:43 +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 3691C340B6E for ; Wed, 10 Aug 2016 09:49:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B423F2444 for ; Wed, 10 Aug 2016 09:49:39 +0000 (UTC) From: "Mike Frysinger" 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 Frysinger" Message-ID: <1470822467.ba55f110bf9831afca12c51ea503e5f5293d28fe.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/file/file-5.28.ebuild sys-apps/file/files/file-5.28-der-mmap.patch X-VCS-Directories: sys-apps/file/ sys-apps/file/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: ba55f110bf9831afca12c51ea503e5f5293d28fe X-VCS-Branch: master Date: Wed, 10 Aug 2016 09:49:39 +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: 8e63b2a8-62a7-436d-871f-820300e46559 X-Archives-Hash: 3c4a426c02faccbabc660a67a0ae3742 commit: ba55f110bf9831afca12c51ea503e5f5293d28fe Author: Mike Frysinger gentoo org> AuthorDate: Wed Aug 10 09:33:42 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Aug 10 09:47:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba55f110 sys-apps/file: add upstream fix for mingw builds sys-apps/file/file-5.28.ebuild | 2 ++ sys-apps/file/files/file-5.28-der-mmap.patch | 36 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/sys-apps/file/file-5.28.ebuild b/sys-apps/file/file-5.28.ebuild index 298edaf..fefe087 100644 --- a/sys-apps/file/file-5.28.ebuild +++ b/sys-apps/file/file-5.28.ebuild @@ -37,6 +37,8 @@ src_prepare() { [[ ${PV} == "9999" ]] && eautoreconf elibtoolize + epatch "${FILESDIR}"/${P}-der-mmap.patch + # don't let python README kill main README #60043 mv python/README{,.python} } diff --git a/sys-apps/file/files/file-5.28-der-mmap.patch b/sys-apps/file/files/file-5.28-der-mmap.patch new file mode 100644 index 0000000..50542a6 --- /dev/null +++ b/sys-apps/file/files/file-5.28-der-mmap.patch @@ -0,0 +1,36 @@ +fix from upstream for building on systems w/out mmap (e.g. mingw) + +From 6f1fbff8114ec2319dd874f3552105b378931eb9 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Fri, 15 Jul 2016 00:56:04 +0000 +Subject: [PATCH] we only need mman for testing. + +--- + src/der.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/der.c b/src/der.c +index fcdeb6c79814..fd093d29ee89 100644 +--- a/src/der.c ++++ b/src/der.c +@@ -35,8 +35,6 @@ + #endif + + #include +-#include +-#include + + #include + #include +@@ -53,6 +51,8 @@ + #include "magic.h" + #include "der.h" + #else ++#include ++#include + #include + #endif + +-- +2.9.0 +