From owner-svn-ports-all@freebsd.org Thu Jan 2 08:19:27 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 579D61F097F; Thu, 2 Jan 2020 08:19:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47pLYC1kHLz42cW; Thu, 2 Jan 2020 08:19:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 368531861D; Thu, 2 Jan 2020 08:19:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0028JRtI094421; Thu, 2 Jan 2020 08:19:27 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0028JR0N094420; Thu, 2 Jan 2020 08:19:27 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202001020819.0028JR0N094420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 2 Jan 2020 08:19:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521803 - head/graphics/gegl/files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/graphics/gegl/files X-SVN-Commit-Revision: 521803 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2020 08:19:27 -0000 Author: bapt Date: Thu Jan 2 08:19:26 2020 New Revision: 521803 URL: https://svnweb.freebsd.org/changeset/ports/521803 Log: Actually add the said patch Added: head/graphics/gegl/files/ head/graphics/gegl/files/cpu-detection.patch (contents, props changed) Added: head/graphics/gegl/files/cpu-detection.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gegl/files/cpu-detection.patch Thu Jan 2 08:19:26 2020 (r521803) @@ -0,0 +1,48 @@ +From 6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Sun, 27 Oct 2019 14:10:08 +0100 +Subject: [PATCH] meson: fix cpu detection + +Use host_machine.cpu_family() instead of cpu(). Only the former +provides a stable/defined set of values. + +Also don't error out on some arches for no good reason. + +This fixes the build on 32bit Windows. +--- + meson.build | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index af133a0f1..540498921 100644 +--- a/meson.build ++++ b/meson.build +@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang' + endif + + +-host_cpu = host_machine.cpu() +-if host_cpu.startswith('i') and host_cpu.endswith('86') ++host_cpu_family = host_machine.cpu_family() ++if host_cpu_family == 'x86' + have_x86 = true + config.set10('ARCH_X86', true) +-elif host_cpu == 'x86_64' ++elif host_cpu_family == 'x86_64' + have_x86 = true + config.set10('ARCH_X86', true) + config.set10('ARCH_X86_64', true) +-elif host_cpu == 'ppc' or host_cpu == 'powerpc' ++elif host_cpu_family == 'ppc' + have_ppc = true + config.set10('ARCH_PPC', true) +-elif host_cpu == 'ppc64' or host_cpu == 'powerpc64' ++elif host_cpu_family == 'ppc64' + have_ppc = true + config.set10('ARCH_PPC', true) + config.set10('ARCH_PPC64', true) +-else +- error('Unknown host architecture') + endif + + ################################################################################