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 847CC138334 for ; Mon, 16 Dec 2019 23:15:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADDD9E0923; Mon, 16 Dec 2019 23:15:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4E56E0923 for ; Mon, 16 Dec 2019 23:15:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4007634D7E1 for ; Mon, 16 Dec 2019 23:15:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59AAA8B0 for ; Mon, 16 Dec 2019 23:15:17 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1576538110.069a96a2ea5aaa7d4d27d2423f4a1845663272eb.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild X-VCS-Directories: dev-embedded/u-boot-tools/ dev-embedded/u-boot-tools/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 069a96a2ea5aaa7d4d27d2423f4a1845663272eb X-VCS-Branch: master Date: Mon, 16 Dec 2019 23:15:17 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1c254284-3dcb-4d3b-a101-d60a6a0b45fe X-Archives-Hash: 5cdac575fc5de81829395d5c4a9b3d56 commit: 069a96a2ea5aaa7d4d27d2423f4a1845663272eb Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Dec 16 23:14:56 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Dec 16 23:15:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069a96a2 dev-embedded/u-boot-tools: fix build on musl, bug #703132 include/compiler.h implies to define 'ulong' type. glibc and musl define it on different conditions. As a result tools fail to build on musl as: include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'? We fix it by defining 'ulong' unconditionally (as on BSD). Reported-by: eroen Closes: https://bugs.gentoo.org/703132 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich gentoo.org> .../files/u-boot-tools-2019.10-musl-ulong.patch | 19 +++++++++++++++++++ dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild | 2 ++ 2 files changed, 21 insertions(+) diff --git a/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch b/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch new file mode 100644 index 00000000000..910e95a8cbf --- /dev/null +++ b/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/703132 + +include/compiler.h implies to define 'ulong' type. +glibc and musl define it on different conditions. +As a result tools fail to build on musl as: + include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'? + +We fix it by defining 'ulong' unconditionally (as on BSD). + +--- a/include/compiler.h ++++ b/include/compiler.h +@@ -44,6 +44,7 @@ + #ifdef __linux__ + # include + # include ++typedef unsigned long ulong; + #elif defined(__MACH__) || defined(__FreeBSD__) + # include + typedef unsigned long ulong; diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild index bcda5a2499b..5e06655915d 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild +++ b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild @@ -22,6 +22,8 @@ DEPEND=" S=${WORKDIR}/${MY_P} +PATCHES=("${FILESDIR}"/${P}-musl-ulong.patch) + src_compile() { # Unset a few KBUILD variables. Bug #540476 unset KBUILD_OUTPUT KBUILD_SRC