acl_2.2.49.bb: Fix build when DISTRO_FEATURES lacks largefile.
PATCH 1/1 acl_2.2.49.bb: Fix build when DISTRO_FEATURES lacks largefile.
--- recipes/udev/acl-2.2.49/nolargefile.patch | 15 +++++++++++++++ recipes/udev/acl_2.2.49.bb | 9 +++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 recipes/udev/acl-2.2.49/nolargefile.patch
recipes/udev/acl-2.2.49/nolargefile.patch new file +15 -0
@@ -0,0 +1,15 @@ +--- acl-2.2.49/chacl/chacl.c.orig 2010-12-21 14:00:42.563984943 +1030 ++++ acl-2.2.49/chacl/chacl.c 2010-12-21 14:01:15.614983219 +1030 +@@ -315,6 +315,12 @@ + return(failed); + } + ++#ifndef __USE_LARGEFILE64 ++/* XXX: hack! */ ++#define dirent64 dirent ++#define readdir64 readdir ++#endif ++ + static int + walk_dir(acl_t acl, acl_t dacl, const char *fname) + {
recipes/udev/acl_2.2.49.bb +7 -2
@@ -1,11 +1,12 @@ DESCRIPTION = "Commands for Manipulating POSIX Access Control Lists" LICENSE = "GPLv2" -PR = "r2" +PR = "r3" DEPENDS = "attr" -SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz" +SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz \ + file://nolargefile.patch" inherit autotools lib_package
@@ -21,6 +22,10 @@ do_configure_append() { echo "#define _(str) str" >> ${S}/include/config.h } +do_configure_prepend() { + ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/include/builddefs.in', d)} +} + do_install() { export PKG_BIN_DIR=${D}${bindir} export PKG_SBIN_DIR=${D}${sbindir}
Signature · 1 line
1.7.1
Quoted 2 lines · Graham Gower
Signed-off-by Graham Gower <[email protected]>
Does it function correctly at runtime ?
Quoted 66 lines
---
recipes/udev/acl-2.2.49/nolargefile.patch | 15 +++++++++++++++ recipes/udev/acl_2.2.49.bb | 9 +++++++--2 files changed, 22 insertions(+), 2 deletions(-)create mode 100644
recipes/udev/acl-2.2.49/nolargefile.patchrecipes/udev/acl-2.2.49/nolargefile.patch new file +15
-0@@ -0,0 +1,15 @@ +--- acl-2.2.49/chacl/chacl.c.orig 2010-12-21 14:00:42.563984943 +1030 ++++ acl-2.2.49/chacl/chacl.c 2010-12-21 14:01:15.614983219 +1030 +@@ -315,6 +315,12 @@ + return(failed); + } + ++#ifndef __USE_LARGEFILE64 ++/* XXX: hack! */ ++#define dirent64 dirent ++#define readdir64 readdir ++#endif ++ + static int + walk_dir(acl_t acl, acl_t dacl, const char *fname) + {recipes/udev/acl_2.2.49.bb +0
-0@@ -1,11 +1,12 @@DESCRIPTION = "Commands for Manipulating POSIX Access Control Lists" LICENSE = "GPLv2"
recipes/udev/acl_2.2.49.bb +1
-1-PR = "r2" +PR = "r3"DEPENDS = "attr"
recipes/udev/acl_2.2.49.bb +2
-1-SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz" +SRC_URI = "http://mirror.its.uidaho.edu/pub/savannah/acl/acl-${PV}.src.tar.gz \ + file://nolargefile.patch"inherit autotools
lib_packagerecipes/udev/acl_2.2.49.bb +0
-0@@ -21,6 +22,10 @@ do_configure_append() {echo "#define
_(str)str" >>${S}/include/config.h}recipes/udev/acl_2.2.49.bb +4
-0+do_configure_prepend() { + ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/include/builddefs.in', d)} +} +do_install() {
export PKG_BIN_DIR=${D}${bindir}
export PKG_SBIN_DIR=${D}${sbindir}
--
1.7.1_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 5 lines · Khem Raj
Quoted 2 lines · Graham Gower
Signed-off-by Graham Gower <[email protected]>Does it function correctly at runtime ?
Can't test yet. I have problems with proxy-libintl conflicting with libintl8 during do_rootfs...
Quoted 10 lines · Graham Gower
Quoted 5 lines · Khem Raj
Quoted 2 lines · Graham Gower
Signed-off-by Graham Gower <[email protected]>Does it function correctly at runtime ?
Can't test yet. I have problems with proxy-libintl conflicting with libintl8 during
do_rootfs...
For what its worth, glibc dirent.h has
#ifndef __USE_FILE_OFFSET64
extern struct dirent *readdir (DIR *__dirp) __nonnull ((1)); #else
# ifdef __REDIRECT
extern struct dirent *__REDIRECT (readdir, (DIR *__dirp), readdir64)
__nonnull ((1));
# else
# define readdir readdir64
# endif
#endif