[ptxdist] [PATCH v2 1/5] dtc: fix build with GCC11

[ptxdist] [PATCH v2 1/5] dtc: fix build with GCC11

[Lucas Stach]

Pick patch from upstream to fix warning with GCC11.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 .../0001-fdtdump-Fix-gcc11-warning.patch      | 30 +++++++++++++++++++
 patches/dtc-v1.6.0/series                     |  4 +++
 2 files changed, 34 insertions(+)
 create mode 100644 patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
 create mode 100644 patches/dtc-v1.6.0/series

diff --git a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch b/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
new file mode 100644
index 000000000000..052419940a15
--- /dev/null
+++ b/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
@@ -0,0 +1,30 @@
+From: David Gibson <david@gibson.dropbear.id.au>
+Date: Wed, 6 Jan 2021 14:52:26 +1100
+Subject: [PATCH] fdtdump: Fix gcc11 warning
+
+In one place, fdtdump abuses fdt_set_magic(), passing it just a small char
+array instead of the full fdt header it expects.  That's relying on the
+fact that in fact fdt_set_magic() will only actually access the first 4
+bytes of the buffer.
+
+This trips a new warning in GCC 11 - and it's entirely possible it was
+always UB.  So, don't do that.
+
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ fdtdump.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fdtdump.c b/fdtdump.c
+index 9613befede71..d9fb374a59be 100644
+--- a/fdtdump.c
++++ b/fdtdump.c
+@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
+ 		char *p = buf;
+ 		char *endp = buf + len;
+ 
+-		fdt_set_magic(smagic, FDT_MAGIC);
++		fdt32_st(smagic, FDT_MAGIC);
+ 
+ 		/* poor man's memmem */
+ 		while ((endp - p) >= FDT_MAGIC_SIZE) {
diff --git a/patches/dtc-v1.6.0/series b/patches/dtc-v1.6.0/series
new file mode 100644
index 000000000000..a7e9d0319ba0
--- /dev/null
+++ b/patches/dtc-v1.6.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fdtdump-Fix-gcc11-warning.patch
+# cb5c26c7ab3ae2082ecff7af4de4e8c5  - git-ptx-patches magic
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 2/5] nspr: version bump 4.26 -> 4.30

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/nspr.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/nspr.make b/rules/nspr.make
index 9c68740e78a5..936dce2b44cd 100644
--- a/rules/nspr.make
+++ b/rules/nspr.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSPR) += nspr
 #
 # Paths and names
 #
-NSPR_VERSION	:= 4.26
-NSPR_MD5	:= 615695d57eaafa1fca085d3891befd68
+NSPR_VERSION	:= 4.30
+NSPR_MD5	:= 99780f9ffa3459392c1143f1408e0e08
 NSPR		:= nspr-$(NSPR_VERSION)
 NSPR_SUFFIX	:= tar.gz
 NSPR_URL	:= https://ftp.mozilla.org/pub/nspr/releases/v$(NSPR_VERSION)/src/$(NSPR).$(NSPR_SUFFIX)
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] nspr: version bump 4.26 -> 4.30

[Michael Olbrich]

Thanks, applied as b2a4773c03ae621f9b24354f364051d27f333e8d.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:23 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210503103743.31995-2-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/nspr.make b/rules/nspr.make
> index 9c68740e78a5..936dce2b44cd 100644
> --- a/rules/nspr.make
> +++ b/rules/nspr.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSPR) += nspr
>  #
>  # Paths and names
>  #
> -NSPR_VERSION	:= 4.26
> -NSPR_MD5	:= 615695d57eaafa1fca085d3891befd68
> +NSPR_VERSION	:= 4.30
> +NSPR_MD5	:= 99780f9ffa3459392c1143f1408e0e08
>  NSPR		:= nspr-$(NSPR_VERSION)
>  NSPR_SUFFIX	:= tar.gz
>  NSPR_URL	:= https://ftp.mozilla.org/pub/nspr/releases/v$(NSPR_VERSION)/src/$(NSPR).$(NSPR_SUFFIX)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 3/5] host-nss: disable array-parameter warning

[Lucas Stach]

This breaks the build with gcc11. For now go the same route as Fedora
and just disable the warning.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 rules/host-nss.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/host-nss.make b/rules/host-nss.make
index f51d4e0f531f..b2fb2bd3ec81 100644
--- a/rules/host-nss.make
+++ b/rules/host-nss.make
@@ -28,9 +28,10 @@ HOST_NSS_MAKE_ENV   := \
 	NSPR_INCLUDE_DIR=$(PTXDIST_SYSROOT_HOST)/include/nspr \
 	$(if $(filter x86_64%,$(GNU_HOST)),USE_64=1)
 
-# needed for old glibc
+# needed for old glibc and gcc11
 HOST_NSS_CFLAGS := \
-	-D_XOPEN_SOURCE
+	-D_XOPEN_SOURCE \
+	-Wno-array-parameter
 
 HOST_NSS_MAKE_OPT := \
 	all
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] host-nss: disable array-parameter warning

[Michael Olbrich]

Thanks, applied as 893418f41b8ef946f7913a225ec99a389e32379f.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:24 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> This breaks the build with gcc11. For now go the same route as Fedora
> and just disable the warning.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210503103743.31995-3-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-nss.make b/rules/host-nss.make
> index f51d4e0f531f..b2fb2bd3ec81 100644
> --- a/rules/host-nss.make
> +++ b/rules/host-nss.make
> @@ -28,9 +28,10 @@ HOST_NSS_MAKE_ENV   := \
>  	NSPR_INCLUDE_DIR=$(PTXDIST_SYSROOT_HOST)/include/nspr \
>  	$(if $(filter x86_64%,$(GNU_HOST)),USE_64=1)
>  
> -# needed for old glibc
> +# needed for old glibc and gcc11
>  HOST_NSS_CFLAGS := \
> -	-D_XOPEN_SOURCE
> +	-D_XOPEN_SOURCE \
> +	-Wno-array-parameter
>  
>  HOST_NSS_MAKE_OPT := \
>  	all

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 4/5] host-fakeroot: version bump 1.25.1 -> 1.25.3

[Lucas Stach]

- version bump
- use new snapshot address
- pull in upstream fixes from https://salsa.debian.org/clint/fakeroot

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 patches/fakeroot-1.25.1/series                |   7 -
 ...fine-_STAT_VER-if-not-already-define.patch |  33 ++++
 ...d-wrappers-for-new-glibc-2.33-symbol.patch |  68 ++++++++
 ...fix-compile-error-with-DEBUG-enabled.patch |  22 +++
 ....ac-fix-__xmknod-at-pointer-argument.patch |  56 ++++++
 ...oot.c-fix-fts_read-and-fts_children.patch} |  21 ++-
 ...ER-defines-for-ppc64le-riscv64-s390x.patch |  26 +++
 .../0007-OS-X-portability.patch               | 161 ++++++++++++++++++
 .../0008-make-fakeroot-relocatable.patch}     |   2 +-
 .../autogen.sh                                |   0
 patches/fakeroot-1.25.3/series                |  13 ++
 rules/host-fakeroot.make                      |   6 +-
 12 files changed, 396 insertions(+), 19 deletions(-)
 delete mode 100644 patches/fakeroot-1.25.1/series
 create mode 100644 patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
 create mode 100644 patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
 create mode 100644 patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
 create mode 100644 patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
 rename patches/{fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch => fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch} (56%)
 create mode 100644 patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
 create mode 100644 patches/fakeroot-1.25.3/0007-OS-X-portability.patch
 rename patches/{fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch => fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch} (96%)
 rename patches/{fakeroot-1.25.1 => fakeroot-1.25.3}/autogen.sh (100%)
 create mode 100644 patches/fakeroot-1.25.3/series

diff --git a/patches/fakeroot-1.25.1/series b/patches/fakeroot-1.25.1/series
deleted file mode 100644
index 60dad17f9d31..000000000000
--- a/patches/fakeroot-1.25.1/series
+++ /dev/null
@@ -1,7 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:debian --start-number 1
-0001-eglibc-fts-without-LFS.patch
-#tag:ptxdist --start-number 100
-0100-make-fakeroot-relocatable.patch
-# e69f7ec6ca564a31bcbb10ed0dcc2fa2  - git-ptx-patches magic
diff --git a/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch b/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
new file mode 100644
index 000000000000..92584801dc10
--- /dev/null
+++ b/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
@@ -0,0 +1,33 @@
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 20:59:25 -0800
+Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined
+
+Based on patch from Jan Pazdziora:
+https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 3e80e38b16db..14cdbc4dca12 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -90,6 +90,16 @@
+ #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
+ #endif
+ 
++#ifndef _STAT_VER
++ #if defined (__aarch64__)
++  #define _STAT_VER 0
++ #elif defined (__x86_64__)
++  #define _STAT_VER 1
++ #else
++  #define _STAT_VER 3
++ #endif
++#endif
++
+ /*
+    These INT_* (which stands for internal) macros should always be used when
+    the fakeroot library owns the storage of the stat variable.
diff --git a/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch b/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
new file mode 100644
index 000000000000..59bc951d3c55
--- /dev/null
+++ b/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
@@ -0,0 +1,68 @@
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 21:00:04 -0800
+Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 14cdbc4dca12..d75c51fa990a 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath,
+ #endif /* HAVE_FSTATAT */
+ 
+ 
++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33)
++/* Glibc 2.33 exports symbols for these functions in the shared lib */
++  int lstat(const char *file_name, struct stat *statbuf) {
++     return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf);
++  }
++  int stat(const char *file_name, struct stat *st) {
++     return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st);
++  }
++  int fstat(int fd, struct stat *st) {
++     return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st);
++  }
++
++  #ifdef HAVE_FSTATAT
++    int fstatat(int dir_fd, const char *path, struct stat *st, int flags) {
++       return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags);
++    }
++  #endif
++
++  #ifdef STAT64_SUPPORT
++    int lstat64(const char *file_name, struct stat64 *st) {
++       return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st);
++    }
++    int stat64(const char *file_name, struct stat64 *st) {
++       return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st);
++    }
++    int fstat64(int fd, struct stat64 *st) {
++       return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st);
++    }
++
++    #ifdef HAVE_FSTATAT
++      int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) {
++	 return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags);
++      }
++    #endif
++  #endif
++
++  int mknod(const char *pathname, mode_t mode, dev_t dev) {
++     return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev);
++  }
++
++  #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT)
++    int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) {
++       return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev);
++    }
++  #endif
++#endif /* GLIBC_PREREQ */
++
++
+ #ifdef FAKEROOT_FAKENET
+ pid_t fork(void)
+ {
diff --git a/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch b/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
new file mode 100644
index 000000000000..8007d73343e5
--- /dev/null
+++ b/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
@@ -0,0 +1,22 @@
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Thu, 11 Feb 2021 21:00:20 -0800
+Subject: [PATCH] libfakeroot.c: fix compile error with DEBUG enabled
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ libfakeroot.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index d75c51fa990a..31480f8323ba 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -2525,7 +2525,7 @@ int statx (int dirfd, const char *path, int flags, unsigned int mask, struct sta
+ 
+ #ifdef LIBFAKEROOT_DEBUGGING
+   if (fakeroot_debug) {
+-    fprintf(stderr, "statx fd %d\n", fd);
++    fprintf(stderr, "statx fd %d\n", dirfd);
+   }
+ #endif /* LIBFAKEROOT_DEBUGGING */
+   r=INT_NEXT_FSTATAT(dirfd, path, &st, flags);
diff --git a/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch b/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
new file mode 100644
index 000000000000..5291625eea1f
--- /dev/null
+++ b/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
@@ -0,0 +1,56 @@
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sat, 13 Feb 2021 19:32:08 -0800
+Subject: [PATCH] configure.ac: fix __xmknod{,at} pointer argument
+
+Switch default to assume * and not the absence of *.
+
+On glibc 2.33+, there is no definition for these functions in header
+files, so the compile test doesn't work. But, we can default to using
+the pointer (as is the case with newer glibc), and use the header file
+on older platforms to fail the test and use no pointer.
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 73415d2a91a6..d85566f089b4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod])
+   ]], [[
+        int __xmknod  ( int ver,
+                        const char *pathname ,
+-                       mode_t  mode ,  dev_t dev);
++                       mode_t  mode ,  dev_t *dev);
+   ]])],[
+-   AC_DEFINE(XMKNOD_FRTH_ARG,)
+-   AC_MSG_RESULT([no extra *])
+-  ],[
+    AC_DEFINE(XMKNOD_FRTH_ARG,[*])
+    AC_MSG_RESULT([needs *])
++  ],[
++   AC_DEFINE(XMKNOD_FRTH_ARG,)
++   AC_MSG_RESULT([no extra *])
+ 
+   ])
+ 
+@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat])
+        int __xmknodat  ( int ver,
+                          int dirfd,
+                          const char *pathname ,
+-                         mode_t  mode ,  dev_t dev);
++                         mode_t  mode ,  dev_t *dev);
+   ]])],[
+-   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
+-   AC_MSG_RESULT([no extra *])
+-  ],[
+    AC_DEFINE(XMKNODAT_FIFTH_ARG,[*])
+    AC_MSG_RESULT([needs *])
++  ],[
++   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
++   AC_MSG_RESULT([no extra *])
+ 
+   ])
+ 
diff --git a/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch b/patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
similarity index 56%
rename from patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
rename to patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
index dca76eff7c91..620afc2ea476 100644
--- a/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
+++ b/patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
@@ -1,19 +1,24 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 23 Sep 2020 09:21:09 +0200
-Subject: [PATCH] eglibc-fts-without-LFS
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sat, 13 Feb 2021 19:35:31 -0800
+Subject: [PATCH] libfakeroot.c: fix fts_read and fts_children
 
-Imported from fakeroot_1.25.1-1.debian.tar.xz
+Apply Debian patch from [0], since glibc is usually built without LFS.
+__USE_LARGEFILE64 and FTSENT64 should be used anyway for proper support
+of this, if needed. See [1] for more details.
 
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+[0]: https://sources.debian.org/patches/fakeroot/1.25.3-1.1/eglibc-fts-without-LFS/
+[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676428
+
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
 ---
  libfakeroot.c | 8 --------
  1 file changed, 8 deletions(-)
 
 diff --git a/libfakeroot.c b/libfakeroot.c
-index 01de9da25c39..badb7235a166 100644
+index 31480f8323ba..169f4da4de21 100644
 --- a/libfakeroot.c
 +++ b/libfakeroot.c
-@@ -2006,11 +2006,7 @@ FTSENT *fts_read(FTS *ftsp) {
+@@ -2066,11 +2066,7 @@ FTSENT *fts_read(FTS *ftsp) {
              || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK))
      r->fts_statp = NULL;  /* Otherwise fts_statp may be a random pointer */
    if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
@@ -25,7 +30,7 @@ index 01de9da25c39..badb7235a166 100644
    }
  
    return r;
-@@ -2029,11 +2025,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
+@@ -2089,11 +2085,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
    first=next_fts_children(ftsp, options);
    for(r = first; r; r = r->fts_link) {
      if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
diff --git a/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch b/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
new file mode 100644
index 000000000000..5db58dcd3ede
--- /dev/null
+++ b/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
@@ -0,0 +1,26 @@
+From: Dimitri John Ledkov <xnox@ubuntu.com>
+Date: Wed, 17 Feb 2021 14:41:43 +0000
+Subject: [PATCH] Add _STAT_VER defines for ppc64le, riscv64, s390x.
+
+Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
+---
+ libfakeroot.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 169f4da4de21..74f52ab1df79 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -93,6 +93,12 @@
+ #ifndef _STAT_VER
+  #if defined (__aarch64__)
+   #define _STAT_VER 0
++ #elif defined (__powerpc__) && __WORDSIZE == 64
++  #define _STAT_VER 1
++ #elif defined (__riscv) && __riscv_xlen==64
++  #define _STAT_VER 0
++ #elif defined (__s390x__)
++  #define _STAT_VER 1
+  #elif defined (__x86_64__)
+   #define _STAT_VER 1
+  #else
diff --git a/patches/fakeroot-1.25.3/0007-OS-X-portability.patch b/patches/fakeroot-1.25.3/0007-OS-X-portability.patch
new file mode 100644
index 000000000000..768696a25953
--- /dev/null
+++ b/patches/fakeroot-1.25.3/0007-OS-X-portability.patch
@@ -0,0 +1,161 @@
+From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+Date: Sat, 13 Feb 2021 20:05:17 -0800
+Subject: [PATCH] OS X portability
+
+OS X portability work from OpenWrt.
+
+Cc: Felix Fietkau <nbd@nbd.name>
+Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
+---
+ configure.ac   |  1 +
+ libfakeroot.c  | 36 ++++++++++++++++++++++++++++++++++--
+ wrapawk_macosx | 10 +++++++---
+ wrapfunc.inp   |  4 ++--
+ 4 files changed, 44 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d85566f089b4..35f9ecf28993 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,6 +146,7 @@ for first in size_t int; do
+ #include <sys/types.h>
+ #endif
+ #include <unistd.h>
++#include <stdio.h>
+ #ifdef HAVE_GRP_H
+ #include <grp.h>
+ #endif
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 74f52ab1df79..f9ca1820e4b7 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -128,8 +128,16 @@
+ #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER)
+ #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER)
+ #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b)
++
++/* 10.10 uses id_t in getpriority/setpriority calls, so pretend
++   id_t is used everywhere, just happens to be int on some OSes */
++#ifndef _ID_T
++#define _ID_T
++typedef int id_t;
++#endif
+ #endif
+ 
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include <sys/ipc.h>
+ #include <sys/msg.h>
+@@ -141,7 +149,6 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <errno.h>
+-#include <sys/types.h>
+ #ifdef HAVE_SYS_ACL_H
+ #include <sys/acl.h>
+ #endif /* HAVE_SYS_ACL_H */
+@@ -204,6 +211,15 @@ extern int unsetenv (const char *name);
+ #undef __lxstat64
+ #undef _FILE_OFFSET_BITS
+ 
++
++#ifndef AT_EMPTY_PATH
++#define AT_EMPTY_PATH 0
++#endif
++
++#ifndef AT_NO_AUTOMOUNT
++#define AT_NO_AUTOMOUNT 0
++#endif
++
+ /*
+ // next_wrap_st:
+ // this structure is used in next_wrap, which is defined in
+@@ -1975,7 +1991,7 @@ ssize_t fremovexattr(int fd, const char *name)
+ }
+ #endif /* HAVE_FREMOVEXATTR */
+ 
+-int setpriority(int which, int who, int prio){
++int setpriority(int which, id_t who, int prio){
+   if (fakeroot_disabled)
+     return next_setpriority(which, who, prio);
+   next_setpriority(which, who, prio);
+@@ -2576,3 +2592,19 @@ int sysinfo(int command, char *buf, long count)
+     }
+ }
+ #endif
++
++#ifdef HAVE_OPENAT
++int openat(int dir_fd, const char *pathname, int flags, ...)
++{
++	mode_t mode;
++
++    if (flags & O_CREAT) {
++        va_list args;
++        va_start(args, flags);
++        mode = va_arg(args, int);
++        va_end(args);
++    }
++
++    return next_openat(dir_fd, pathname, flags, mode);
++}
++#endif
+diff --git a/wrapawk_macosx b/wrapawk_macosx
+index 088a7f48de49..f783219758ac 100644
+--- a/wrapawk_macosx
++++ b/wrapawk_macosx
+@@ -46,26 +46,30 @@ BEGIN{
+   argtype=$3;
+   argname=$4;
+   MACRO=$5;
++  argtype_def=$6
++  if(!argtype_def) {
++    argtype_def = argtype
++  }
+   if(MACRO){
+     print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
+     print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);"   > structfile;
+     print "#undef " name                      > deffile
+     print "#define " name " MY_DEF(" name "_RAW)" > deffile
+ 
+-    print "extern " ret, name, argtype ";"              > tmpffile;
++    print "extern " ret, name, argtype_def ";"          > tmpffile;
+     print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile;
+     print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile;
+     print "  return " name, argname ";"                 > tmpffile;
+     print "}"                                           > tmpffile;
+     print ""                                            > tmpffile;
+   } else {
+-    print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
++    print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile;
+     print "#undef " name                                > structfile;
+     print "INTERPOSE(my_" name "," name ");"            > structfile;
+     print "#define " name " my_" name                   > structfile
+     print "#define " name " my_" name                   > deffile
+ 
+-    print "extern " ret, name, argtype ";"              > tmpffile;
++    print "extern " ret, name, argtype_def ";"          > tmpffile;
+     if(argname){
+         print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile;
+         print "static __inline__ " ret " next_" name, argtype " {" > tmpffile;
+diff --git a/wrapfunc.inp b/wrapfunc.inp
+index f7ad1867891a..556af34579b0 100644
+--- a/wrapfunc.inp
++++ b/wrapfunc.inp
+@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid)
+ initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group)
+ getgroups;int;(int size, gid_t list[]);(size, list)
+ setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list)
+-setpriority;int;(int which, int who, int prio);(which, who, prio)
++setpriority;int;(int which, id_t who, int prio);(which, who, prio)
+ #ifdef HAVE_CAPSET
+ capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap)
+ #endif /* HAVE_CAPSET */
+@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *path, uid_t owner, gid_t group, int flags)
+ mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode)
+ #endif /* HAVE_MKDIRAT */
+ #ifdef HAVE_OPENAT
+-openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags)
++openat;int;(int dir_fd, const char *pathname, int flags, mode_t mode);(dir_fd, pathname, flags, mode);;(int dir_fd, const char *pathname, int flags, ...)
+ #endif /* HAVE_OPENAT */
+ #ifdef HAVE_RENAMEAT
+ renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath)
diff --git a/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch b/patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
similarity index 96%
rename from patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
rename to patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
index 9d203b4c1100..8d7a6994cf9c 100644
--- a/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
+++ b/patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
@@ -12,7 +12,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
-index 0f6bf66088a5..bedf9aeb39c2 100755
+index 0d6f435af1ed..08d8b27863a8 100755
 --- a/scripts/fakeroot.in
 +++ b/scripts/fakeroot.in
 @@ -30,12 +30,12 @@ fatal ()
diff --git a/patches/fakeroot-1.25.1/autogen.sh b/patches/fakeroot-1.25.3/autogen.sh
similarity index 100%
rename from patches/fakeroot-1.25.1/autogen.sh
rename to patches/fakeroot-1.25.3/autogen.sh
diff --git a/patches/fakeroot-1.25.3/series b/patches/fakeroot-1.25.3/series
new file mode 100644
index 000000000000..fa00105832e5
--- /dev/null
+++ b/patches/fakeroot-1.25.3/series
@@ -0,0 +1,13 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+#tag:upstream --start-number 1
+0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
+0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
+0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
+0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
+0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
+0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
+0007-OS-X-portability.patch
+#tag:ptxdist --start-number 100
+0008-make-fakeroot-relocatable.patch
+# d07e91409b4dcfb1e6e2abd76ddc7481  - git-ptx-patches magic
diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make
index 27b0d01f5260..3a09e4ce84a2 100644
--- a/rules/host-fakeroot.make
+++ b/rules/host-fakeroot.make
@@ -15,12 +15,12 @@ HOST_PACKAGES-$(PTXCONF_HOST_FAKEROOT) += host-fakeroot
 #
 # Paths and names
 #
-HOST_FAKEROOT_VERSION	:= 1.25.1
-HOST_FAKEROOT_MD5	:= 48b92ef9772b2ec088120c845e1edbd0
+HOST_FAKEROOT_VERSION	:= 1.25.3
+HOST_FAKEROOT_MD5	:= f6104ef6960c962377ef062bf222a1d2
 HOST_FAKEROOT_SUFFIX	:= tar.gz
 HOST_FAKEROOT		:= fakeroot-$(HOST_FAKEROOT_VERSION)
 HOST_FAKEROOT_TARBALL	:= fakeroot_$(HOST_FAKEROOT_VERSION).orig.$(HOST_FAKEROOT_SUFFIX)
-HOST_FAKEROOT_URL	:= https://snapshot.debian.org/archive/debian/20200923T030305Z/pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL)
+HOST_FAKEROOT_URL	:= https://snapshot.debian.org/archive/debian/20210123T025406Z/pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL)
 HOST_FAKEROOT_SOURCE	:= $(SRCDIR)/$(HOST_FAKEROOT_TARBALL)
 HOST_FAKEROOT_DIR	:= $(HOST_BUILDDIR)/$(HOST_FAKEROOT)
 HOST_FAKEROOT_LICENSE	:= GPL-3.0-or-later
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] host-fakeroot: version bump 1.25.1 -> 1.25.3

[Michael Olbrich]

Thanks, applied as d02f4bdebe27800d279507cc5f1defb2a8ad1a49.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:25 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> - version bump
> - use new snapshot address
> - pull in upstream fixes from https://salsa.debian.org/clint/fakeroot
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210503103743.31995-4-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/fakeroot-1.25.1/series b/patches/fakeroot-1.25.1/series
> deleted file mode 100644
> index 60dad17f9d31..000000000000
> --- a/patches/fakeroot-1.25.1/series
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -#tag:debian --start-number 1
> -0001-eglibc-fts-without-LFS.patch
> -#tag:ptxdist --start-number 100
> -0100-make-fakeroot-relocatable.patch
> -# e69f7ec6ca564a31bcbb10ed0dcc2fa2  - git-ptx-patches magic
> diff --git a/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch b/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
> new file mode 100644
> index 000000000000..92584801dc10
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
> @@ -0,0 +1,33 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Thu, 11 Feb 2021 20:59:25 -0800
> +Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined
> +
> +Based on patch from Jan Pazdziora:
> +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + libfakeroot.c | 10 ++++++++++
> + 1 file changed, 10 insertions(+)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 3e80e38b16db..14cdbc4dca12 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -90,6 +90,16 @@
> + #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
> + #endif
> + 
> ++#ifndef _STAT_VER
> ++ #if defined (__aarch64__)
> ++  #define _STAT_VER 0
> ++ #elif defined (__x86_64__)
> ++  #define _STAT_VER 1
> ++ #else
> ++  #define _STAT_VER 3
> ++ #endif
> ++#endif
> ++
> + /*
> +    These INT_* (which stands for internal) macros should always be used when
> +    the fakeroot library owns the storage of the stat variable.
> diff --git a/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch b/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
> new file mode 100644
> index 000000000000..59bc951d3c55
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
> @@ -0,0 +1,68 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Thu, 11 Feb 2021 21:00:04 -0800
> +Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
> + 1 file changed, 48 insertions(+)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 14cdbc4dca12..d75c51fa990a 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath,
> + #endif /* HAVE_FSTATAT */
> + 
> + 
> ++#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33)
> ++/* Glibc 2.33 exports symbols for these functions in the shared lib */
> ++  int lstat(const char *file_name, struct stat *statbuf) {
> ++     return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf);
> ++  }
> ++  int stat(const char *file_name, struct stat *st) {
> ++     return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st);
> ++  }
> ++  int fstat(int fd, struct stat *st) {
> ++     return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st);
> ++  }
> ++
> ++  #ifdef HAVE_FSTATAT
> ++    int fstatat(int dir_fd, const char *path, struct stat *st, int flags) {
> ++       return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags);
> ++    }
> ++  #endif
> ++
> ++  #ifdef STAT64_SUPPORT
> ++    int lstat64(const char *file_name, struct stat64 *st) {
> ++       return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st);
> ++    }
> ++    int stat64(const char *file_name, struct stat64 *st) {
> ++       return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st);
> ++    }
> ++    int fstat64(int fd, struct stat64 *st) {
> ++       return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st);
> ++    }
> ++
> ++    #ifdef HAVE_FSTATAT
> ++      int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) {
> ++	 return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags);
> ++      }
> ++    #endif
> ++  #endif
> ++
> ++  int mknod(const char *pathname, mode_t mode, dev_t dev) {
> ++     return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev);
> ++  }
> ++
> ++  #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT)
> ++    int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) {
> ++       return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev);
> ++    }
> ++  #endif
> ++#endif /* GLIBC_PREREQ */
> ++
> ++
> + #ifdef FAKEROOT_FAKENET
> + pid_t fork(void)
> + {
> diff --git a/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch b/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
> new file mode 100644
> index 000000000000..8007d73343e5
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
> @@ -0,0 +1,22 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Thu, 11 Feb 2021 21:00:20 -0800
> +Subject: [PATCH] libfakeroot.c: fix compile error with DEBUG enabled
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + libfakeroot.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index d75c51fa990a..31480f8323ba 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -2525,7 +2525,7 @@ int statx (int dirfd, const char *path, int flags, unsigned int mask, struct sta
> + 
> + #ifdef LIBFAKEROOT_DEBUGGING
> +   if (fakeroot_debug) {
> +-    fprintf(stderr, "statx fd %d\n", fd);
> ++    fprintf(stderr, "statx fd %d\n", dirfd);
> +   }
> + #endif /* LIBFAKEROOT_DEBUGGING */
> +   r=INT_NEXT_FSTATAT(dirfd, path, &st, flags);
> diff --git a/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch b/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
> new file mode 100644
> index 000000000000..5291625eea1f
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
> @@ -0,0 +1,56 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Sat, 13 Feb 2021 19:32:08 -0800
> +Subject: [PATCH] configure.ac: fix __xmknod{,at} pointer argument
> +
> +Switch default to assume * and not the absence of *.
> +
> +On glibc 2.33+, there is no definition for these functions in header
> +files, so the compile test doesn't work. But, we can default to using
> +the pointer (as is the case with newer glibc), and use the header file
> +on older platforms to fail the test and use no pointer.
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + configure.ac | 16 ++++++++--------
> + 1 file changed, 8 insertions(+), 8 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 73415d2a91a6..d85566f089b4 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod])
> +   ]], [[
> +        int __xmknod  ( int ver,
> +                        const char *pathname ,
> +-                       mode_t  mode ,  dev_t dev);
> ++                       mode_t  mode ,  dev_t *dev);
> +   ]])],[
> +-   AC_DEFINE(XMKNOD_FRTH_ARG,)
> +-   AC_MSG_RESULT([no extra *])
> +-  ],[
> +    AC_DEFINE(XMKNOD_FRTH_ARG,[*])
> +    AC_MSG_RESULT([needs *])
> ++  ],[
> ++   AC_DEFINE(XMKNOD_FRTH_ARG,)
> ++   AC_MSG_RESULT([no extra *])
> + 
> +   ])
> + 
> +@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat])
> +        int __xmknodat  ( int ver,
> +                          int dirfd,
> +                          const char *pathname ,
> +-                         mode_t  mode ,  dev_t dev);
> ++                         mode_t  mode ,  dev_t *dev);
> +   ]])],[
> +-   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
> +-   AC_MSG_RESULT([no extra *])
> +-  ],[
> +    AC_DEFINE(XMKNODAT_FIFTH_ARG,[*])
> +    AC_MSG_RESULT([needs *])
> ++  ],[
> ++   AC_DEFINE(XMKNODAT_FIFTH_ARG,)
> ++   AC_MSG_RESULT([no extra *])
> + 
> +   ])
> + 
> diff --git a/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch b/patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> similarity index 56%
> rename from patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
> rename to patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> index dca76eff7c91..620afc2ea476 100644
> --- a/patches/fakeroot-1.25.1/0001-eglibc-fts-without-LFS.patch
> +++ b/patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> @@ -1,19 +1,24 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Wed, 23 Sep 2020 09:21:09 +0200
> -Subject: [PATCH] eglibc-fts-without-LFS
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Sat, 13 Feb 2021 19:35:31 -0800
> +Subject: [PATCH] libfakeroot.c: fix fts_read and fts_children
>  
> -Imported from fakeroot_1.25.1-1.debian.tar.xz
> +Apply Debian patch from [0], since glibc is usually built without LFS.
> +__USE_LARGEFILE64 and FTSENT64 should be used anyway for proper support
> +of this, if needed. See [1] for more details.
>  
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> +[0]: https://sources.debian.org/patches/fakeroot/1.25.3-1.1/eglibc-fts-without-LFS/
> +[1]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676428
> +
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
>  ---
>   libfakeroot.c | 8 --------
>   1 file changed, 8 deletions(-)
>  
>  diff --git a/libfakeroot.c b/libfakeroot.c
> -index 01de9da25c39..badb7235a166 100644
> +index 31480f8323ba..169f4da4de21 100644
>  --- a/libfakeroot.c
>  +++ b/libfakeroot.c
> -@@ -2006,11 +2006,7 @@ FTSENT *fts_read(FTS *ftsp) {
> +@@ -2066,11 +2066,7 @@ FTSENT *fts_read(FTS *ftsp) {
>               || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK))
>       r->fts_statp = NULL;  /* Otherwise fts_statp may be a random pointer */
>     if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
> @@ -25,7 +30,7 @@ index 01de9da25c39..badb7235a166 100644
>     }
>   
>     return r;
> -@@ -2029,11 +2025,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
> +@@ -2089,11 +2085,7 @@ FTSENT *fts_children(FTS *ftsp, int options) {
>     first=next_fts_children(ftsp, options);
>     for(r = first; r; r = r->fts_link) {
>       if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
> diff --git a/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch b/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
> new file mode 100644
> index 000000000000..5db58dcd3ede
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
> @@ -0,0 +1,26 @@
> +From: Dimitri John Ledkov <xnox@ubuntu.com>
> +Date: Wed, 17 Feb 2021 14:41:43 +0000
> +Subject: [PATCH] Add _STAT_VER defines for ppc64le, riscv64, s390x.
> +
> +Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
> +---
> + libfakeroot.c | 6 ++++++
> + 1 file changed, 6 insertions(+)
> +
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 169f4da4de21..74f52ab1df79 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -93,6 +93,12 @@
> + #ifndef _STAT_VER
> +  #if defined (__aarch64__)
> +   #define _STAT_VER 0
> ++ #elif defined (__powerpc__) && __WORDSIZE == 64
> ++  #define _STAT_VER 1
> ++ #elif defined (__riscv) && __riscv_xlen==64
> ++  #define _STAT_VER 0
> ++ #elif defined (__s390x__)
> ++  #define _STAT_VER 1
> +  #elif defined (__x86_64__)
> +   #define _STAT_VER 1
> +  #else
> diff --git a/patches/fakeroot-1.25.3/0007-OS-X-portability.patch b/patches/fakeroot-1.25.3/0007-OS-X-portability.patch
> new file mode 100644
> index 000000000000..768696a25953
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/0007-OS-X-portability.patch
> @@ -0,0 +1,161 @@
> +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +Date: Sat, 13 Feb 2021 20:05:17 -0800
> +Subject: [PATCH] OS X portability
> +
> +OS X portability work from OpenWrt.
> +
> +Cc: Felix Fietkau <nbd@nbd.name>
> +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
> +---
> + configure.ac   |  1 +
> + libfakeroot.c  | 36 ++++++++++++++++++++++++++++++++++--
> + wrapawk_macosx | 10 +++++++---
> + wrapfunc.inp   |  4 ++--
> + 4 files changed, 44 insertions(+), 7 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index d85566f089b4..35f9ecf28993 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -146,6 +146,7 @@ for first in size_t int; do
> + #include <sys/types.h>
> + #endif
> + #include <unistd.h>
> ++#include <stdio.h>
> + #ifdef HAVE_GRP_H
> + #include <grp.h>
> + #endif
> +diff --git a/libfakeroot.c b/libfakeroot.c
> +index 74f52ab1df79..f9ca1820e4b7 100644
> +--- a/libfakeroot.c
> ++++ b/libfakeroot.c
> +@@ -128,8 +128,16 @@
> + #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER)
> + #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER)
> + #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b)
> ++
> ++/* 10.10 uses id_t in getpriority/setpriority calls, so pretend
> ++   id_t is used everywhere, just happens to be int on some OSes */
> ++#ifndef _ID_T
> ++#define _ID_T
> ++typedef int id_t;
> ++#endif
> + #endif
> + 
> ++#include <sys/types.h>
> + #include <stdlib.h>
> + #include <sys/ipc.h>
> + #include <sys/msg.h>
> +@@ -141,7 +149,6 @@
> + #include <unistd.h>
> + #include <dirent.h>
> + #include <errno.h>
> +-#include <sys/types.h>
> + #ifdef HAVE_SYS_ACL_H
> + #include <sys/acl.h>
> + #endif /* HAVE_SYS_ACL_H */
> +@@ -204,6 +211,15 @@ extern int unsetenv (const char *name);
> + #undef __lxstat64
> + #undef _FILE_OFFSET_BITS
> + 
> ++
> ++#ifndef AT_EMPTY_PATH
> ++#define AT_EMPTY_PATH 0
> ++#endif
> ++
> ++#ifndef AT_NO_AUTOMOUNT
> ++#define AT_NO_AUTOMOUNT 0
> ++#endif
> ++
> + /*
> + // next_wrap_st:
> + // this structure is used in next_wrap, which is defined in
> +@@ -1975,7 +1991,7 @@ ssize_t fremovexattr(int fd, const char *name)
> + }
> + #endif /* HAVE_FREMOVEXATTR */
> + 
> +-int setpriority(int which, int who, int prio){
> ++int setpriority(int which, id_t who, int prio){
> +   if (fakeroot_disabled)
> +     return next_setpriority(which, who, prio);
> +   next_setpriority(which, who, prio);
> +@@ -2576,3 +2592,19 @@ int sysinfo(int command, char *buf, long count)
> +     }
> + }
> + #endif
> ++
> ++#ifdef HAVE_OPENAT
> ++int openat(int dir_fd, const char *pathname, int flags, ...)
> ++{
> ++	mode_t mode;
> ++
> ++    if (flags & O_CREAT) {
> ++        va_list args;
> ++        va_start(args, flags);
> ++        mode = va_arg(args, int);
> ++        va_end(args);
> ++    }
> ++
> ++    return next_openat(dir_fd, pathname, flags, mode);
> ++}
> ++#endif
> +diff --git a/wrapawk_macosx b/wrapawk_macosx
> +index 088a7f48de49..f783219758ac 100644
> +--- a/wrapawk_macosx
> ++++ b/wrapawk_macosx
> +@@ -46,26 +46,30 @@ BEGIN{
> +   argtype=$3;
> +   argname=$4;
> +   MACRO=$5;
> ++  argtype_def=$6
> ++  if(!argtype_def) {
> ++    argtype_def = argtype
> ++  }
> +   if(MACRO){
> +     print "extern " ret " MY_DEF(" name ")" argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
> +     print "INTERPOSE(MY_DEF(" name "_RAW)," name "_RAW);"   > structfile;
> +     print "#undef " name                      > deffile
> +     print "#define " name " MY_DEF(" name "_RAW)" > deffile
> + 
> +-    print "extern " ret, name, argtype ";"              > tmpffile;
> ++    print "extern " ret, name, argtype_def ";"          > tmpffile;
> +     print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " __attribute__((always_inline));" > tmpffile;
> +     print "static __inline__ " ret " NEXT_" MACRO "_NOARG " argtype " {" > tmpffile;
> +     print "  return " name, argname ";"                 > tmpffile;
> +     print "}"                                           > tmpffile;
> +     print ""                                            > tmpffile;
> +   } else {
> +-    print "extern " ret " my_" name, argtype " __attribute__((visibility(\"hidden\")));" > headerfile;
> ++    print "extern " ret " my_" name, argtype_def " __attribute__((visibility(\"hidden\")));" > headerfile;
> +     print "#undef " name                                > structfile;
> +     print "INTERPOSE(my_" name "," name ");"            > structfile;
> +     print "#define " name " my_" name                   > structfile
> +     print "#define " name " my_" name                   > deffile
> + 
> +-    print "extern " ret, name, argtype ";"              > tmpffile;
> ++    print "extern " ret, name, argtype_def ";"          > tmpffile;
> +     if(argname){
> +         print "static __inline__ " ret " next_" name, argtype " __attribute__((always_inline));" > tmpffile;
> +         print "static __inline__ " ret " next_" name, argtype " {" > tmpffile;
> +diff --git a/wrapfunc.inp b/wrapfunc.inp
> +index f7ad1867891a..556af34579b0 100644
> +--- a/wrapfunc.inp
> ++++ b/wrapfunc.inp
> +@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid)
> + initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group)
> + getgroups;int;(int size, gid_t list[]);(size, list)
> + setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list)
> +-setpriority;int;(int which, int who, int prio);(which, who, prio)
> ++setpriority;int;(int which, id_t who, int prio);(which, who, prio)
> + #ifdef HAVE_CAPSET
> + capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap)
> + #endif /* HAVE_CAPSET */
> +@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *path, uid_t owner, gid_t group, int flags)
> + mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode)
> + #endif /* HAVE_MKDIRAT */
> + #ifdef HAVE_OPENAT
> +-openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags)
> ++openat;int;(int dir_fd, const char *pathname, int flags, mode_t mode);(dir_fd, pathname, flags, mode);;(int dir_fd, const char *pathname, int flags, ...)
> + #endif /* HAVE_OPENAT */
> + #ifdef HAVE_RENAMEAT
> + renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath)
> diff --git a/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch b/patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
> similarity index 96%
> rename from patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
> rename to patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
> index 9d203b4c1100..8d7a6994cf9c 100644
> --- a/patches/fakeroot-1.25.1/0100-make-fakeroot-relocatable.patch
> +++ b/patches/fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch
> @@ -12,7 +12,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   1 file changed, 3 insertions(+), 3 deletions(-)
>  
>  diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
> -index 0f6bf66088a5..bedf9aeb39c2 100755
> +index 0d6f435af1ed..08d8b27863a8 100755
>  --- a/scripts/fakeroot.in
>  +++ b/scripts/fakeroot.in
>  @@ -30,12 +30,12 @@ fatal ()
> diff --git a/patches/fakeroot-1.25.1/autogen.sh b/patches/fakeroot-1.25.3/autogen.sh
> similarity index 100%
> rename from patches/fakeroot-1.25.1/autogen.sh
> rename to patches/fakeroot-1.25.3/autogen.sh
> diff --git a/patches/fakeroot-1.25.3/series b/patches/fakeroot-1.25.3/series
> new file mode 100644
> index 000000000000..fa00105832e5
> --- /dev/null
> +++ b/patches/fakeroot-1.25.3/series
> @@ -0,0 +1,13 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +#tag:upstream --start-number 1
> +0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
> +0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
> +0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
> +0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
> +0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
> +0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
> +0007-OS-X-portability.patch
> +#tag:ptxdist --start-number 100
> +0008-make-fakeroot-relocatable.patch
> +# d07e91409b4dcfb1e6e2abd76ddc7481  - git-ptx-patches magic
> diff --git a/rules/host-fakeroot.make b/rules/host-fakeroot.make
> index 27b0d01f5260..3a09e4ce84a2 100644
> --- a/rules/host-fakeroot.make
> +++ b/rules/host-fakeroot.make
> @@ -15,12 +15,12 @@ HOST_PACKAGES-$(PTXCONF_HOST_FAKEROOT) += host-fakeroot
>  #
>  # Paths and names
>  #
> -HOST_FAKEROOT_VERSION	:= 1.25.1
> -HOST_FAKEROOT_MD5	:= 48b92ef9772b2ec088120c845e1edbd0
> +HOST_FAKEROOT_VERSION	:= 1.25.3
> +HOST_FAKEROOT_MD5	:= f6104ef6960c962377ef062bf222a1d2
>  HOST_FAKEROOT_SUFFIX	:= tar.gz
>  HOST_FAKEROOT		:= fakeroot-$(HOST_FAKEROOT_VERSION)
>  HOST_FAKEROOT_TARBALL	:= fakeroot_$(HOST_FAKEROOT_VERSION).orig.$(HOST_FAKEROOT_SUFFIX)
> -HOST_FAKEROOT_URL	:= https://snapshot.debian.org/archive/debian/20200923T030305Z/pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL)
> +HOST_FAKEROOT_URL	:= https://snapshot.debian.org/archive/debian/20210123T025406Z/pool/main/f/fakeroot/$(HOST_FAKEROOT_TARBALL)
>  HOST_FAKEROOT_SOURCE	:= $(SRCDIR)/$(HOST_FAKEROOT_TARBALL)
>  HOST_FAKEROOT_DIR	:= $(HOST_BUILDDIR)/$(HOST_FAKEROOT)
>  HOST_FAKEROOT_LICENSE	:= GPL-3.0-or-later

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 5/5] qt5: fix build with GCC11

[Lucas Stach]

Some of those files are used to build host-side tools, so those changes are
needed to fix the build on a host with GCC11.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 ...tbase-include-limits-where-necessary.patch | 69 +++++++++++++++++++
 patches/qt-everywhere-src-5.15.2/series       |  3 +-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch

diff --git a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
new file mode 100644
index 000000000000..33138cc3623c
--- /dev/null
+++ b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
@@ -0,0 +1,69 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Sat, 1 May 2021 00:57:24 +0200
+Subject: [PATCH] qtbase: include limits where necessary
+
+Upstream fixes:
+https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
+https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
+
+Fixes build with GCC11, which changed internal includes so that
+limits isn't implicitly pulled in some cases.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+---
+ qtbase/src/corelib/global/qendian.h             | 2 ++
+ qtbase/src/corelib/global/qfloat16.h            | 1 +
+ qtbase/src/corelib/text/qbytearraymatcher.h     | 2 ++
+ qtbase/src/corelib/tools/qoffsetstringarray_p.h | 1 +
+ 4 files changed, 6 insertions(+)
+
+diff --git a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h
+index 257efbbdbecf..a97776c761b7 100644
+--- a/qtbase/src/corelib/global/qendian.h
++++ b/qtbase/src/corelib/global/qendian.h
+@@ -44,6 +44,8 @@
+ #include <QtCore/qfloat16.h>
+ #include <QtCore/qglobal.h>
+ 
++#include <limits>
++
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h
+index c7a9c87af322..5302be072ed8 100644
+--- a/qtbase/src/corelib/global/qfloat16.h
++++ b/qtbase/src/corelib/global/qfloat16.h
+@@ -43,6 +43,7 @@
+ 
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
++#include <limits>
+ #include <string.h>
+ 
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
+diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h
+index 0eedfc1d2035..f5f9bef7b87c 100644
+--- a/qtbase/src/corelib/text/qbytearraymatcher.h
++++ b/qtbase/src/corelib/text/qbytearraymatcher.h
+@@ -42,6 +42,8 @@
+ 
+ #include <QtCore/qbytearray.h>
+ 
++#include <limits>
++
+ QT_BEGIN_NAMESPACE
+ 
+ 
+diff --git a/qtbase/src/corelib/tools/qoffsetstringarray_p.h b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
+index 4dd9e9603bc1..8b3fbfe55985 100644
+--- a/qtbase/src/corelib/tools/qoffsetstringarray_p.h
++++ b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
+@@ -53,6 +53,7 @@
+ 
+ #include "private/qglobal_p.h"
+ 
++#include <limits>
+ #include <tuple>
+ #include <array>
+ 
diff --git a/patches/qt-everywhere-src-5.15.2/series b/patches/qt-everywhere-src-5.15.2/series
index 68b5075b33b2..226529352040 100644
--- a/patches/qt-everywhere-src-5.15.2/series
+++ b/patches/qt-everywhere-src-5.15.2/series
@@ -7,4 +7,5 @@
 0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
 0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
 0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
-# 4b456a724e88b1f3c6125e3941898e96  - git-ptx-patches magic
+0008-qtbase-include-limits-where-necessary.patch
+# 0339a08cc8ad82af4c6542508057d7e7  - git-ptx-patches magic
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] qt5: fix build with GCC11

[Michael Olbrich]

Thanks, applied as cf8088742976a59972ed26d82fb715d025cdddad.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:27 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Some of those files are used to build host-side tools, so those changes are
> needed to fix the build on a host with GCC11.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210503103743.31995-5-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
> new file mode 100644
> index 000000000000..33138cc3623c
> --- /dev/null
> +++ b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch
> @@ -0,0 +1,69 @@
> +From: Lucas Stach <l.stach@pengutronix.de>
> +Date: Sat, 1 May 2021 00:57:24 +0200
> +Subject: [PATCH] qtbase: include limits where necessary
> +
> +Upstream fixes:
> +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
> +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
> +
> +Fixes build with GCC11, which changed internal includes so that
> +limits isn't implicitly pulled in some cases.
> +
> +Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> +---
> + qtbase/src/corelib/global/qendian.h             | 2 ++
> + qtbase/src/corelib/global/qfloat16.h            | 1 +
> + qtbase/src/corelib/text/qbytearraymatcher.h     | 2 ++
> + qtbase/src/corelib/tools/qoffsetstringarray_p.h | 1 +
> + 4 files changed, 6 insertions(+)
> +
> +diff --git a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h
> +index 257efbbdbecf..a97776c761b7 100644
> +--- a/qtbase/src/corelib/global/qendian.h
> ++++ b/qtbase/src/corelib/global/qendian.h
> +@@ -44,6 +44,8 @@
> + #include <QtCore/qfloat16.h>
> + #include <QtCore/qglobal.h>
> + 
> ++#include <limits>
> ++
> + // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
> + #include <stdlib.h>
> + #include <string.h>
> +diff --git a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h
> +index c7a9c87af322..5302be072ed8 100644
> +--- a/qtbase/src/corelib/global/qfloat16.h
> ++++ b/qtbase/src/corelib/global/qfloat16.h
> +@@ -43,6 +43,7 @@
> + 
> + #include <QtCore/qglobal.h>
> + #include <QtCore/qmetatype.h>
> ++#include <limits>
> + #include <string.h>
> + 
> + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
> +diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h
> +index 0eedfc1d2035..f5f9bef7b87c 100644
> +--- a/qtbase/src/corelib/text/qbytearraymatcher.h
> ++++ b/qtbase/src/corelib/text/qbytearraymatcher.h
> +@@ -42,6 +42,8 @@
> + 
> + #include <QtCore/qbytearray.h>
> + 
> ++#include <limits>
> ++
> + QT_BEGIN_NAMESPACE
> + 
> + 
> +diff --git a/qtbase/src/corelib/tools/qoffsetstringarray_p.h b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
> +index 4dd9e9603bc1..8b3fbfe55985 100644
> +--- a/qtbase/src/corelib/tools/qoffsetstringarray_p.h
> ++++ b/qtbase/src/corelib/tools/qoffsetstringarray_p.h
> +@@ -53,6 +53,7 @@
> + 
> + #include "private/qglobal_p.h"
> + 
> ++#include <limits>
> + #include <tuple>
> + #include <array>
> + 
> diff --git a/patches/qt-everywhere-src-5.15.2/series b/patches/qt-everywhere-src-5.15.2/series
> index 68b5075b33b2..226529352040 100644
> --- a/patches/qt-everywhere-src-5.15.2/series
> +++ b/patches/qt-everywhere-src-5.15.2/series
> @@ -7,4 +7,5 @@
>  0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
>  0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
>  0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch
> -# 4b456a724e88b1f3c6125e3941898e96  - git-ptx-patches magic
> +0008-qtbase-include-limits-where-necessary.patch
> +# 0339a08cc8ad82af4c6542508057d7e7  - git-ptx-patches magic

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] dtc: fix build with GCC11

[Michael Olbrich]

Thanks, applied as c9de1f5357809c4d00396ebaf2f1ba3de1258269.

Michael

[sent from post-receive hook]

On Thu, 27 May 2021 08:45:21 +0200, Lucas Stach <l.stach@pengutronix.de> wrote:
> Pick patch from upstream to fix warning with GCC11.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Message-Id: <20210503103743.31995-1-l.stach@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch b/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
> new file mode 100644
> index 000000000000..052419940a15
> --- /dev/null
> +++ b/patches/dtc-v1.6.0/0001-fdtdump-Fix-gcc11-warning.patch
> @@ -0,0 +1,30 @@
> +From: David Gibson <david@gibson.dropbear.id.au>
> +Date: Wed, 6 Jan 2021 14:52:26 +1100
> +Subject: [PATCH] fdtdump: Fix gcc11 warning
> +
> +In one place, fdtdump abuses fdt_set_magic(), passing it just a small char
> +array instead of the full fdt header it expects.  That's relying on the
> +fact that in fact fdt_set_magic() will only actually access the first 4
> +bytes of the buffer.
> +
> +This trips a new warning in GCC 11 - and it's entirely possible it was
> +always UB.  So, don't do that.
> +
> +Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> +---
> + fdtdump.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/fdtdump.c b/fdtdump.c
> +index 9613befede71..d9fb374a59be 100644
> +--- a/fdtdump.c
> ++++ b/fdtdump.c
> +@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
> + 		char *p = buf;
> + 		char *endp = buf + len;
> + 
> +-		fdt_set_magic(smagic, FDT_MAGIC);
> ++		fdt32_st(smagic, FDT_MAGIC);
> + 
> + 		/* poor man's memmem */
> + 		while ((endp - p) >= FDT_MAGIC_SIZE) {
> diff --git a/patches/dtc-v1.6.0/series b/patches/dtc-v1.6.0/series
> new file mode 100644
> index 000000000000..a7e9d0319ba0
> --- /dev/null
> +++ b/patches/dtc-v1.6.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-fdtdump-Fix-gcc11-warning.patch
> +# cb5c26c7ab3ae2082ecff7af4de4e8c5  - git-ptx-patches magic

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de