Skip to contentSkip to conversation

zip: Don't define NO_DIR

PATCH Böszörményi Zoltán 1 participant 1 message May 2, 2024 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

This one was actually "v2" that patchtest does not fail. Please apply.

2024. 05. 01. 8:17 keltezéssel, Zoltan Boszormenyi via lists.openembedded.org írta:

Quoted 127 lines

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 <dirent.h> and <sys/dir.h> 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.

---
  ...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

meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch deleted +0 -35
deleted file mode 100644
index a86e03e620..0000000000
@@ -1,35 +0,0 @@
-From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-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 <[email protected]>
----
- 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 <sys/dir.h>
- #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
-
meta/recipes-extended/zip/zip-3.0/dont-define-NO_DIR.patch new file +14 -0
new file mode 100644
index 0000000000..8528dbb55e
@@ -0,0 +1,14 @@
+Upstream-Status: Inactive-Upstream [no upstream]
+Signed-off-by: Zoltán Böszörményi <[email protected]>
+
+--- 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
+
meta/recipes-extended/zip/zip_3.0.bb +3 -4
index 70df5ab872..a548087545 100644
@@ -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'"
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#198786): https://lists.openembedded.org/g/openembedded-core/message/198786
Mute This Topic: https://lists.openembedded.org/mt/105836341/3617728
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-