From patchwork Sun Oct 22 15:41:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1853219 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SD2cV04RPz23jV for ; Mon, 23 Oct 2023 02:41:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 326C870A97; Sun, 22 Oct 2023 15:41:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 326C870A97 X-Virus-Scanned: amavisd-new at osuosl.org 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 rcnWAINmC-Bz; Sun, 22 Oct 2023 15:41:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 0B90D70AA9; Sun, 22 Oct 2023 15:41:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0B90D70AA9 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9EA8F1BF399 for ; Sun, 22 Oct 2023 15:41:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8471D4F572 for ; Sun, 22 Oct 2023 15:41:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8471D4F572 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FnP5JOCrGlXZ for ; Sun, 22 Oct 2023 15:41:38 +0000 (UTC) Received: from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57]) by smtp4.osuosl.org (Postfix) with ESMTPS id C41964F570 for ; Sun, 22 Oct 2023 15:41:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C41964F570 Received: from fli4l.lan.fli4l (p4fd6ced1.dip0.t-ipconnect.de [79.214.206.209]) by dd20012.kasserver.com (Postfix) with ESMTPSA id 3478BA4C0CB2; Sun, 22 Oct 2023 17:41:34 +0200 (CEST) Received: from bruckner.lan.fli4l ([192.168.1.1]:37936) by fli4l.lan.fli4l with esmtp (Exim 4.96.2) (envelope-from ) id 1quaa5-0005US-2T; Sun, 22 Oct 2023 17:41:33 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 22 Oct 2023 17:41:33 +0200 Message-Id: <20231022154133.1619344-1-bernd@kuhls.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spamd-Bar: ++ X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuhls.net; s=kas202306131828; t=1697989294; bh=JNJ0Gbcgse8oiPjS+GjCDPSh/UlDEiWhyQefQm8xHbU=; h=From:To:Cc:Subject:Date:From; b=JUwj2ttkf7JC4tDNxcRlLZAo8spebnS5ux8jiI2eH0813O0IsQN0uR2PMof7Bx2h0 isjGeAjk/aRHRxPBqS6meBL6XgDgZEs7yH3q+zLVxl1s/+cU60lzPpPwv9wC187odP WrElpPYg8nYRWk0WFvcngGRrVZd9S6TUlxz6ZohMhBxktQMyXuPC9ACwWiEmQU4ZLz 2DAuCU9BZHJXtUDTgaMI7VA9IKEy9ranEz2E10xKFzh4W7+AdQ5iq/xpFJ/YOIduVC 26Wa8y95cVeZJnoLcG7CRATJaTgUm97UYE/5VgtGGYOWvkXcrKgbnJ+pgfWTju+bRO DUlWuWFY6lscA== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256 header.s=kas202306131828 header.b=JUwj2ttk Subject: [Buildroot] [PATCH v2 1/1] package/elfutils: enable on musl X-BeenThere: buildroot@buildroot.org 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: Laurent Vivier , "Wojciech M . Zabolotny" , James Hilliard , Romain Naour , Tobias Waldekranz Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Buildroot commit eb60820c0a9b3f938f32516f24df2eee9aac1e26 disabled elfutils for musl toolchains in 2015. Current code builds fine with musl so remove the exceptions. Signed-off-by: Bernd Kuhls --- v2: fix ELFUTILS_CONF_OPTS (Thomas) package/avrdude/Config.in | 6 ++---- package/bpftool/Config.in | 4 +--- package/elfutils/Config.in | 9 +++------ package/elfutils/elfutils.mk | 5 ++++- package/kexec-lite/Config.in | 6 ++---- package/kmemd/Config.in | 6 ++---- package/libbpf/Config.in | 6 ++---- package/ltrace/Config.in | 6 ++---- package/mesa3d/Config.in | 8 -------- package/petitboot/Config.in | 4 +--- package/racehound/Config.in | 6 ++---- 11 files changed, 21 insertions(+), 45 deletions(-) diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in index cbbd076667..06fee0ca7f 100644 --- a/package/avrdude/Config.in +++ b/package/avrdude/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_AVRDUDE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LIBUSB @@ -27,7 +26,6 @@ comment "SPI support needs a toolchain w/ linux headers >= 4.8" endif -comment "avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library, gcc >= 4.9" +comment "avrdude needs a toolchain w/ threads, wchar, dynamic library, gcc >= 4.9" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index d131ec566e..ef3a7a8a45 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_BPFTOOL depends on BR2_USE_WCHAR # binutils, elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 select BR2_PACKAGE_BINUTILS select BR2_PACKAGE_ELFUTILS @@ -24,11 +23,10 @@ config BR2_PACKAGE_BPFTOOL bpftool is a tool for for inspection and simple manipulation of eBPF programs and maps. -comment "bpftool needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.12" +comment "bpftool needs a toolchain w/ wchar, dynamic library, threads, headers >= 4.12" depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_nios2 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in index 5f45de14ab..c355048c6d 100644 --- a/package/elfutils/Config.in +++ b/package/elfutils/Config.in @@ -1,17 +1,14 @@ -comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" +comment "elfutils needs a toolchain w/ wchar, dynamic library, threads" depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_ELFUTILS bool "elfutils" depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS - # Only glibc and uClibc implement the myriad of required GNUisms - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help Libraries/utilities to handle ELF objects (drop in diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 0757851b72..28fcb52eb3 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -61,8 +61,11 @@ HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod ELFUTILS_CONF_ENV += \ LDFLAGS="$(ELFUTILS_LDFLAGS)" -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) ELFUTILS_DEPENDENCIES += argp-standalone +endif + +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ELFUTILS_CONF_OPTS += --disable-symbol-versioning endif diff --git a/package/kexec-lite/Config.in b/package/kexec-lite/Config.in index abfa95ab36..5beaec6418 100644 --- a/package/kexec-lite/Config.in +++ b/package/kexec-lite/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_KEXEC_LITE depends on !BR2_STATIC_LIBS # dtc, elfutils depends on BR2_USE_WCHAR # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_DTC select BR2_PACKAGE_DTC_PROGRAMS @@ -18,8 +17,7 @@ config BR2_PACKAGE_KEXEC_LITE https://github.com/antonblanchard/kexec-lite -comment "kexec-lite needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" +comment "kexec-lite needs a toolchain w/ wchar, dynamic library, threads" depends on BR2_powerpc || BR2_powerpc64 depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/kmemd/Config.in b/package/kmemd/Config.in index cd92757508..b3aebf1224 100644 --- a/package/kmemd/Config.in +++ b/package/kmemd/Config.in @@ -5,16 +5,14 @@ config BR2_PACKAGE_KMEMD depends on !BR2_STATIC_LIBS # libbpf depends on BR2_TOOLCHAIN_HAS_THREADS # libbpf depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # libbpf select BR2_PACKAGE_LIBBPF help Explore a live Linux kernel's memory using GDB https://github.com/wkz/kmemd -comment "kmemd needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 5.14" +comment "kmemd needs a toolchain w/ wchar, dynamic library, threads, headers >= 5.14" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 diff --git a/package/libbpf/Config.in b/package/libbpf/Config.in index 1465366c9e..a78392cdc8 100644 --- a/package/libbpf/Config.in +++ b/package/libbpf/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_LIBBPF depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_ZLIB help @@ -16,9 +15,8 @@ config BR2_PACKAGE_LIBBPF https://github.com/libbpf/libbpf -comment "libbpf needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.13" +comment "libbpf needs a toolchain w/ wchar, dynamic library, threads, headers >= 4.13" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in index ce5a85edcf..21d381db70 100644 --- a/package/ltrace/Config.in +++ b/package/ltrace/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_LTRACE depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS select BR2_PACKAGE_ELFUTILS help @@ -26,8 +25,7 @@ config BR2_PACKAGE_LTRACE http://ltrace.org -comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" +comment "ltrace needs a toolchain w/ wchar, dynamic library, threads" depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 1e4a73a50f..ca7b9c8178 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -194,7 +194,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI depends on BR2_USE_MMU # libdrm depends on BR2_i386 || BR2_x86_64 depends on BR2_PACKAGE_MESA3D_LLVM - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_AMDGPU select BR2_PACKAGE_LIBDRM_RADEON @@ -204,13 +203,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI help Driver for ATI/AMD Radeon HD7000/HD8000/Rx200 GPUs. -# Radeon SI needs libelf -# musl is not currently compatible with elfutils -comment "Radeon SI driver needs a uClibc or glibc toolchain" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_MESA3D_LLVM - depends on !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA bool "Gallium vmware svga driver" depends on BR2_i386 || BR2_x86_64 diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 0b4dc762bb..3d3c798c25 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_PETITBOOT depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils, lvm2 depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, lvm2 - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper @@ -22,10 +21,9 @@ config BR2_PACKAGE_PETITBOOT http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html -comment "petitboot needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, udev /dev management" +comment "petitboot needs a toolchain w/ wchar, dynamic library, threads, udev /dev management" depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ BR2_TOOLCHAIN_HAS_THREADS || \ - !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) || \ !BR2_PACKAGE_HAS_UDEV diff --git a/package/racehound/Config.in b/package/racehound/Config.in index d13f90adb4..5b8bdc77bc 100644 --- a/package/racehound/Config.in +++ b/package/racehound/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_RACEHOUND depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils # only x86/x86_64 supported depends on BR2_i386 || BR2_x86_64 select BR2_PACKAGE_ELFUTILS @@ -30,8 +29,7 @@ comment "racehound needs an Linux kernel >= 3.14 to be built" depends on !BR2_LINUX_KERNEL depends on BR2_i386 || BR2_x86_64 -comment "racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads" +comment "racehound needs a toolchain w/ C++, wchar, dynamic library, threads" depends on BR2_i386 || BR2_x86_64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) + || !BR2_TOOLCHAIN_HAS_THREADS