From patchwork Wed May 1 05:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= X-Patchwork-Id: 43021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 480D5C4345F for ; Wed, 1 May 2024 05:55:38 +0000 (UTC) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.6112.1714542928784040583 for ; Tue, 30 Apr 2024 22:55:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mBTChYvl; spf=pass (domain: gmail.com, ip: 209.85.128.51, mailfrom: zboszor@gmail.com) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4196c62bb4eso48303995e9.2 for ; Tue, 30 Apr 2024 22:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714542927; x=1715147727; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=yalFNWM2psXJRz6G2fVFr3EvP2OLqtRqkr/G9mwcag0=; b=mBTChYvlx6TkdCfkWsGqnQ4pYIqb3BhKdORACOA3KLuiwNRjRt8DfcDvlPaGQ5PurJ azug9hm6j/dnnbtyz4kcdTjHAE6T6VCXalQUFEJhQYFa3kjCGHBq2voMX0ayl1VBhoWu x7J8mAVAGRJ8doO9y9yavN207cSxpqAcMAQ8rI0IsleWMLxmQrDptFSErCdrFhx3M1Bq 30KnrTD74O5rIXZhKmMjcCetimkCD7tLXLETZUB/P0qTv/r/W+z4cXXiK3vhBXckTi8q Bbi1cq74WZphShqt7g7HbrLiYQ+4HO+11Vv0WpTWPyRT7T+wEJe0id+axO2+lozZvF6M fDdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714542927; x=1715147727; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yalFNWM2psXJRz6G2fVFr3EvP2OLqtRqkr/G9mwcag0=; b=rEBWe4WCajuVnan1Eg3ncjVqIGcIhagrfi7aXAJubqsE87GVyN2tRCbMvYTn+/WtUC widxwHyfCor3hJyCj7jYQUBy7iK3dJnK+Ks9qd2ll6HYACnMslWcgh0gdem/7PyeHdMj SUHk9kNbZ+Blce+NevN0dMKB99Vsk4OgavjrjrLDR1fNCm2h+LFii42ni8x8gIVu6jAm 2UEcKeLR0eILb4IY/RrRsCxjWOr45wqzYju4HEL/OoT14O7f/49Xyb2mcC9CZrR3LF3j PNwoJydH5tPv6Hi28FPDrNW2YVjGVImcqa/telC4goLFtR9ekNn2D+cvXjLiUc+sIpED OeQQ== X-Gm-Message-State: AOJu0YxFUFKQ3WDxNQOeM3+PSvQadYpfvfbRkMxsaDyjN/MtAXffCYBg iJ/sD9kcZg7VXQinNBUz86VhFzdXbwqXiZS90hSsjjcZJe6uDwUEYkjpSFXz X-Google-Smtp-Source: AGHT+IH90camDt7djZ3ak/In1GXGOnjqjmfyS1bhHQ9+SKHezTZ2lJ2sYNyYGqm9ya7UmUls3up/4Q== X-Received: by 2002:a05:600c:2294:b0:41c:f64:2f5 with SMTP id 20-20020a05600c229400b0041c0f6402f5mr992534wmf.36.1714542926622; Tue, 30 Apr 2024 22:55:26 -0700 (PDT) Received: from localhost.lan (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id z10-20020a05600c220a00b0041bef325c4esm7538206wml.1.2024.04.30.22.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 22:55:26 -0700 (PDT) From: " =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= " X-Google-Original-From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-core@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [PATCH] zip: Don't define NO_DIR Date: Wed, 1 May 2024 07:55:22 +0200 Message-ID: <20240501055522.3601631-1-zoltan.boszormenyi@xenial.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 01 May 2024 05:55:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198783 From: Zoltán Böszörményi The build framework of zip adds -DNO_DIR to CFLAGS after failing to link this piece of test code: int main() { return closedir(opendir(".")); } However, zip does not take a case into account when it does not need to link to an extra library for these functions. When -DNO_DIR is used, the code in unix.c defines custom opendir()/readdir()/closedir() functions in a way that GCC 14 chokes on. GLIBC has both and and apps don't need any extra library to link with. Add a patch to remove the definition of NO_DIR. Instead, use -DHAVE_DIRENT_H in the recipe. Remove 0002-unix.c-Do-not-redefine-DIR-as-FILE.patch which is now unnecessary. This fixes the compiler error observed with GCC 14. Signed-off-by: Zoltán Böszörményi --- ...2-unix.c-Do-not-redefine-DIR-as-FILE.patch | 35 ------------------- .../zip/zip-3.0/dont-define-NO_DIR.patch | 14 ++++++++ meta/recipes-extended/zip/zip_3.0.bb | 6 ++-- 3 files changed, 17 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch create mode 100644 meta/recipes-extended/zip/zip-3.0/dont-define-NO_DIR.patch diff --git a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch b/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch deleted file mode 100644 index a86e03e620..0000000000 --- a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 10 Aug 2022 17:19:38 -0700 -Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE - -DIR is already provided on Linux via -/usr/include/dirent.h system header - -Upstream-Status: Inactive-Upstream -Signed-off-by: Khem Raj ---- - unix/unix.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/unix/unix.c b/unix/unix.c -index ba87614..6e6f4d2 100644 ---- a/unix/unix.c -+++ b/unix/unix.c -@@ -61,13 +61,11 @@ local time_t label_utim = 0; - /* Local functions */ - local char *readd OF((DIR *)); - -- - #ifdef NO_DIR /* for AT&T 3B1 */ - #include - #ifndef dirent - # define dirent direct - #endif --typedef FILE DIR; - /* - ** Apparently originally by Rich Salz. - ** Cleaned up and modified by James W. Birdsall. --- -2.37.1 - diff --git a/meta/recipes-extended/zip/zip-3.0/dont-define-NO_DIR.patch b/meta/recipes-extended/zip/zip-3.0/dont-define-NO_DIR.patch new file mode 100644 index 0000000000..8528dbb55e --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/dont-define-NO_DIR.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inactive-Upstream +Signed-off-by: Zoltán Böszörményi + +--- zip30/unix/configure~ 2024-05-01 07:22:18.000000000 +0200 ++++ zip30/unix/configure 2024-05-01 07:23:04.725337836 +0200 +@@ -604,8 +604,6 @@ + done + if [ ${OPT} ]; then + LFLAGS2="${LFLAGS2} ${OPT}" +- else +- CFLAGS="${CFLAGS} -DNO_DIR" + fi + fi + diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index 70df5ab872..a548087545 100644 --- a/meta/recipes-extended/zip/zip_3.0.bb +++ b/meta/recipes-extended/zip/zip_3.0.bb @@ -17,8 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar. file://0002-configure-support-PIC-code-build.patch \ file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ file://0001-configure-Specify-correct-function-signatures-and-de.patch \ - file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \ file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ + file://dont-define-NO_DIR.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" @@ -32,8 +32,8 @@ CVE_STATUS[CVE-2018-13684] = "cpe-incorrect: Not for zip but for smart contract # CFLAGS_NOOPT. It will also force -O3 optimization, overriding # whatever we set. EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ - 'CFLAGS=-I. -DUNIX ${CFLAGS}' \ - 'CFLAGS_NOOPT=-I. -DUNIX ${CFLAGS}' \ + 'CFLAGS=-I. -DUNIX -DHAVE_DIRENT_H ${CFLAGS}' \ + 'CFLAGS_NOOPT=-I. -DUNIX -DHAVE_DIRENT_H ${CFLAGS}' \ 'INSTALL=install' 'INSTALL_D=install -d' \ 'BINFLAGS=0755'"