From patchwork Fri Oct 24 16:42:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9218 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ctTGv3C7cz3wkn for ; Fri, 24 Oct 2025 16:43:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ctTGv1fHWz3NS for ; Fri, 24 Oct 2025 16:43:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ctTGv0wNQz32fr for ; Fri, 24 Oct 2025 16:43:03 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ctTGr4Bz8z2xQT for ; Fri, 24 Oct 2025 16:43:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (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 mail01.ipfire.org (Postfix) with ESMTPSA id 4ctTGp0tcmz2Hc; Fri, 24 Oct 2025 16:42:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1761324178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6cTJbjqe4AXVGcCkFheeUMmsjY/VrTzD8wjiVX+7pA4=; b=0iyHhdJsiXyp2VgAh6Sp5KEvSpY+vy0mJNJg2Fi28gGP340c3czEAO5+/fyR8pS0KAuybF GlTy8YR2bQjvlKBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1761324178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6cTJbjqe4AXVGcCkFheeUMmsjY/VrTzD8wjiVX+7pA4=; b=KmVfswwyyud70UOVsT6bmuUU9GUAQ9MQtkwmtumsAeCJVz+QrE5sAWPN5BYJRZuhQixRcw 7OHhVGaCDACCcojAiJC1AfshhBFjBpD/fNMC2YcYfHA4Vy+VUTnASV9QPYgBJw0bVxd3uR V2Uh+iWIwfHu0Apj7Ygh+BRm4rdvxkkUKG5lc1vLC0JnNA1LE9LnEZB4XjkiEP54iHILpW TgbUm5IZR734vEUEJ5Wda96hH4tUcb7o1fxcUsrQ//JHQJMkwWJfm3EOqEZtVZslcs4xj0 3x8GigIJPV8AeyJUZ5hxLIK3MwxoIfoHZ5rqFj34woGMQHbAT+QFdTnrK1t79w== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] nasm: Use only with x86_64 Date: Fri, 24 Oct 2025 18:42:55 +0200 Message-ID: <20251024164255.1704420-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - nasm is linked in to syslinux and libjpeg. - libjpeg will only require nasm if CET has been enabled in glibc and the architecture is x86_64. CET is not enabled in IPFire, therefore libjpeg does not require nasm for building in x86_64 and is not required at all for libjpeg under aarch64 or riscv64 - syslinux requires nasm to build but only in x86_64. - This patch sets the supported architecture to x86_64 only. The build of nasm will be skipped in aarch64 and riscv64. - The x86_64 build ran as normal. The build was also tested for aarch64 and the build of nasm was skipped. syslinux is skipped and libjpeg built successfully confirming that nasm does not need to be built for aarch64 or riscv64. - The patch is removed as it is only required for building nasm for an arm architecture Signed-off-by: Adolf Belka --- lfs/nasm | 2 +- ...00_fix_typo_in_le32toh_function_name.patch | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch diff --git a/lfs/nasm b/lfs/nasm index bd56757d9..26f91cc1b 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -31,6 +31,7 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = x86_64 ############################################################################### # Top-level Rules @@ -70,7 +71,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch cd $(DIR_APP) && ./configure \ --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch b/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch deleted file mode 100644 index 3b198b2d8..000000000 --- a/src/patches/nasm-3.00_fix_typo_in_le32toh_function_name.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- nasm-3.00/include/bytesex.h.orig 2025-10-03 21:41:41.000000000 +0200 -+++ nasm-3.00/include/bytesex.h 2025-10-06 15:03:06.434849426 +0200 -@@ -215,7 +215,7 @@ - } __attribute__((packed)); - static inline uint32_t getu32(const void *p) - { -- return l32toh(((const struct unaligned32 *)p)->v); -+ return le32toh(((const struct unaligned32 *)p)->v); - } - static inline uint32_t setu32(void *p, uint32_t v) - { -@@ -253,7 +253,7 @@ - static inline uint32_t getu32(const void *p) - { - const uint32_t _unaligned *pp = p; -- return l32toh(*pp); -+ return le32toh(*pp); - } - static inline uint32_t setu32(void *p, uint32_t v) - {