From patchwork Fri May 7 18:30:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1475643 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qHR+/gdz; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FcJtF1ltrz9sXL for ; Sat, 8 May 2021 04:31:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 28B204197D; Fri, 7 May 2021 18:30:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UWATeU5YuOsK; Fri, 7 May 2021 18:30:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 6C01E40112; Fri, 7 May 2021 18:30:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9C2BE1BF85D for ; Fri, 7 May 2021 18:30:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8C01A61612 for ; Fri, 7 May 2021 18:30:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y6xe-ej_d4uq for ; Fri, 7 May 2021 18:30:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by smtp3.osuosl.org (Postfix) with ESMTPS id 79DAF605BA for ; Fri, 7 May 2021 18:30:53 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id d4so10190152wru.7 for ; Fri, 07 May 2021 11:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yT2ns0alIGyEfN1o8HQzREJdzozs1VBvq3e/drVfuI4=; b=qHR+/gdzVyx9tP8P+Fk7zTwknnhv9EGfXeTl8s9Md5uBF9PaGxKMQymuoRC+rOzy1P MAc2xQYJlPIoJhol5sA4d/FKkM90pAIfFZnL9kMs1n2tu0VLR6njI+Uu+VknEerJoUX1 oQYdsrBdFsGkFm/8tiYRmEV7F8SOTVUhlXUyOREfVhQTFwueJFoAfslZslDOWxpBcvvo +fhKMztxf+/7S1g7SbvR8LQeU+dFvP/SDCicjCs3RnII6BD1x/oXgUpVeEcHrSFUSQ5Z nZwRZt1gR5rsiJek/us+JqZWiIVcGLMgI92su0KqPG/LH67hbxuz9n+cNmQbLxtu+FfC l+qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yT2ns0alIGyEfN1o8HQzREJdzozs1VBvq3e/drVfuI4=; b=uK/oZFYz3Bdmt3Q3BGIVqYa7wtt2Xugmm2c8RF7c/VLDKoTRW11dl6r3O3GTMLRJQp tniUTMZkrkjej5Y/fnlcNNt3v852mBLuVNx4QamZAUoTaZ1OsbXMSAJkQYABE3wAaJi/ YVOyV44a1t+bhzJKJ4NtJ97YLP+03BgOVcXtT/D4sbFKYUlA0hDIVdETHOUHV3VIVxsV 7lJHODRbTS5yV/61/uZvmcA/PZn9vuKqOvqTbbCvF/BNzFUj+l0uLn1prPj/Hqk8W7Kl 7CsOFhi/GgFgpACdm7Hnvu/VUhG1TuVvWwP6CY3KAacYoxZQXemsVMchLYI6s39HRq4+ A7xg== X-Gm-Message-State: AOAM5332sYHa9SNrrl9dnCnuq4bjTxVu3jzNn+tM7GUwSj8oycYCd1Cd bY/N6/h47PvwL006iZe3lBcpa4NkQDo= X-Google-Smtp-Source: ABdhPJyfLYd5H4sGXe/xbyeXEBxJ2L76opqD0HGnNd2qahPsqPcF8aJorQQec+UV/4m/z1WfN78llw== X-Received: by 2002:adf:eccc:: with SMTP id s12mr14366473wro.125.1620412251494; Fri, 07 May 2021 11:30:51 -0700 (PDT) Received: from kali.home (lfbn-ren-1-1383-171.w86-229.abo.wanadoo.fr. [86.229.230.171]) by smtp.gmail.com with ESMTPSA id n7sm9361473wri.14.2021.05.07.11.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 11:30:50 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 7 May 2021 20:30:09 +0200 Message-Id: <20210507183009.2584138-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/hwloc: bump to version 2.4.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Steven Noonan , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Add ac_cv_prog_cc_c99 to avoid a build failure due to https://github.com/open-mpi/hwloc/commit/f2226f76e104923a76c5d09328284104abad6b01 - Update hash of COPYING, copyrights added with https://github.com/open-mpi/hwloc/commit/ebaa3595e2ddc6e0e94e8ea5b1472f1a21969c80 - Update indentation in hash file (two spaces) As a side effect, this will remove numactl dependency (which raises a build failure with sparc v8 since commit 4ed540ddf59bec4b389be44d7f42820d2466904f) thanks to: https://github.com/open-mpi/hwloc/commit/e6a53bbf65458fd5fe4d45d5a83027b530566591 https://github.com/open-mpi/hwloc/blob/hwloc-2.4.1/NEWS Fixes: - http://autobuild.buildroot.org/results/5f9394d3bab4e83edbea9bc607c3e135adfdabbc Signed-off-by: Fabrice Fontaine --- package/hwloc/hwloc.hash | 8 +++----- package/hwloc/hwloc.mk | 17 +++++++---------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index 9637ba1325..e207a6bb1a 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,6 +1,4 @@ -# From https://www.open-mpi.org/software/hwloc/v1.11/ -md5 3c792e23c209e9e1bafe9bdbc613d401 hwloc-1.11.13.tar.bz2 -sha1 c3ae96a845ff3800f28b28fdb48146f971589653 hwloc-1.11.13.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.4/ +sha256 392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63 hwloc-2.4.1.tar.bz2 # Locally computed -sha256 a4494b7765f517c0990d1c7f09d98cb87755bb6b841e4e2cbfebca1b14bac9c8 hwloc-1.11.13.tar.bz2 -sha256 c1816ed2da6aea779c4f27352f807c8bbaf545c2843d7b2ae818e1d529028821 COPYING +sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 9ec94f818d..77a25a1775 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,16 +4,20 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 1.11 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).13 +HWLOC_VERSION_MAJOR = 2.4 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 -HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/downloads +HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause HWLOC_LICENSE_FILES = COPYING HWLOC_DEPENDENCIES = host-pkgconf HWLOC_INSTALL_STAGING = YES HWLOC_SELINUX_MODULES = hwloc +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. +HWLOC_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99 + HWLOC_CONF_OPTS = \ --disable-opencl \ --disable-cuda \ @@ -30,11 +34,4 @@ else HWLOC_CONF_OPTS += --disable-pci endif -ifeq ($(BR2_PACKAGE_NUMACTL),y) -HWLOC_CONF_OPTS += --enable-libnuma -HWLOC_DEPENDENCIES += numactl -else -HWLOC_CONF_OPTS += --disable-libnuma -endif - $(eval $(autotools-package))