[openwrt/openwrt] tools/fakeroot: fix build regression on macOS

LEDE Commits lede-commits at lists.infradead.org
Thu Jan 14 08:06:16 EST 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3fd070e089569b1f68f8baddf1a4373dd7c02cc8

commit 3fd070e089569b1f68f8baddf1a4373dd7c02cc8
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Jan 11 18:03:29 2021 +0100

    tools/fakeroot: fix build regression on macOS
    
    AT_EMPTY_PATH and AT_NO_AUTOMOUNT does not exist there
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 tools/fakeroot/patches/100-portability.patch | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/tools/fakeroot/patches/100-portability.patch b/tools/fakeroot/patches/100-portability.patch
index 315a9e16bf..7ba12996be 100644
--- a/tools/fakeroot/patches/100-portability.patch
+++ b/tools/fakeroot/patches/100-portability.patch
@@ -25,7 +25,23 @@
  #ifdef HAVE_SYS_ACL_H
  #include <sys/acl.h>
  #endif /* HAVE_SYS_ACL_H */
-@@ -1911,7 +1918,7 @@ ssize_t fremovexattr(int fd, const char
+@@ -188,6 +195,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
+@@ -1911,7 +1927,7 @@ ssize_t fremovexattr(int fd, const char
  }
  #endif /* HAVE_FREMOVEXATTR */
  
@@ -34,7 +50,7 @@
    if (fakeroot_disabled)
      return next_setpriority(which, who, prio);
    next_setpriority(which, who, prio);
-@@ -2520,3 +2527,19 @@ int sysinfo(int command, char *buf, long
+@@ -2520,3 +2536,19 @@ int sysinfo(int command, char *buf, long
      }
  }
  #endif



More information about the lede-commits mailing list