diff mbox series

[meta-oe,1/2] libfaketime: Remove recipe, it is in oe-core now

Message ID 20261103150959.4060867-1-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,1/2] libfaketime: Remove recipe, it is in oe-core now | expand

Commit Message

Khem Raj Nov. 3, 2026, 3:09 p.m. UTC
libfaketime was imported into oe-core (f3a4faaf4c "libfaketime: Import
recipe from meta-oe") and has had fixes there since: a 32-bit build fix,
the clang 23 fix, -O1 for the clobbered-variable error and the man page
install. Both copies are 0.9.13 at the same layer priority, so bitbake
picks one by parse order and currently ends up with the outdated meta-oe
copy.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Cc: Ross Burton <ross.burton@arm.com>
---
 ...-write-only-real_-pointers-as-unused.patch | 68 -------------------
 .../libfaketime/libfaketime_0.9.13.bb         | 30 --------
 2 files changed, 98 deletions(-)
 delete mode 100644 meta-oe/recipes-test/libfaketime/libfaketime/0001-Mark-write-only-real_-pointers-as-unused.patch
 delete mode 100644 meta-oe/recipes-test/libfaketime/libfaketime_0.9.13.bb
diff mbox series

Patch

diff --git a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Mark-write-only-real_-pointers-as-unused.patch b/meta-oe/recipes-test/libfaketime/libfaketime/0001-Mark-write-only-real_-pointers-as-unused.patch
deleted file mode 100644
index c7a854a196..0000000000
--- a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Mark-write-only-real_-pointers-as-unused.patch
+++ /dev/null
@@ -1,68 +0,0 @@ 
-From d0fd7b4be89feb6a8809216b0dc1d84299bbad96 Mon Sep 17 00:00:00 2001
-From: Khem Raj <khem.raj@oss.qualcomm.com>
-Date: Mon, 7 Sep 2026 19:27:57 -0700
-Subject: [PATCH] Mark write-only real_* pointers as unused
-
-clang 23 added -Wunused-but-set-global, which together with the -Werror
-in src/Makefile breaks the build:
-
-  libfaketime.c:340:23: error: variable 'real_lstat' set but not used
-    [-Werror,-Wunused-but-set-global]
-
-ftpl_init() deliberately resolves every real_* pointer up front ('Look
-up all real_* functions. NULL will mark missing ones.'), but several of
-them are only consumed on other platforms or under build options that
-are off by default, so on Linux/glibc they are written and never read.
-
-Annotate exactly those with __attribute__((unused)). This is understood
-by every gcc and clang that can build libfaketime, unlike a
--Wno-error=unused-but-set-global flag, which older compilers reject.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
----
- src/libfaketime.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/libfaketime.c b/src/libfaketime.c
-index e674883..2addaab 100644
---- a/src/libfaketime.c
-+++ b/src/libfaketime.c
-@@ -337,26 +337,26 @@ static __thread bool dont_fake = false;
- /* pointers to real (not faked) functions */
- static int          (*real_stat)            (const char *, struct stat *);
- static int          (*real_fstat)           (int, struct stat *);
--static int          (*real_lstat)           (const char *, struct stat *);
-+static int          (*real_lstat)           (const char *, struct stat *) __attribute__((unused));
- #ifndef __ANDROID__
- static int          (*real_xstat)           (int, const char *, struct stat *);
- static int          (*real_fxstat)          (int, int, struct stat *);
--static int          (*real_fxstatat)        (int, int, const char *, struct stat *, int);
--static int          (*real_lxstat)          (int, const char *, struct stat *);
-+static int          (*real_fxstatat)        (int, int, const char *, struct stat *, int) __attribute__((unused));
-+static int          (*real_lxstat)          (int, const char *, struct stat *) __attribute__((unused));
- #endif
- #if !defined(__APPLE__) || !__DARWIN_ONLY_64_BIT_INO_T
- #ifndef __ANDROID__
--static int          (*real_stat64)          (const char *, struct stat64 *);
--static int          (*real_xstat64)         (int, const char *, struct stat64 *);
--static int          (*real_fxstat64)        (int, int , struct stat64 *);
--static int          (*real_fxstatat64)      (int, int , const char *, struct stat64 *, int);
--static int          (*real_lxstat64)        (int, const char *, struct stat64 *);
-+static int          (*real_stat64)          (const char *, struct stat64 *) __attribute__((unused));
-+static int          (*real_xstat64)         (int, const char *, struct stat64 *) __attribute__((unused));
-+static int          (*real_fxstat64)        (int, int , struct stat64 *) __attribute__((unused));
-+static int          (*real_fxstatat64)      (int, int , const char *, struct stat64 *, int) __attribute__((unused));
-+static int          (*real_lxstat64)        (int, const char *, struct stat64 *) __attribute__((unused));
- #endif
- #endif
- #ifdef STATX_TYPE
--static int          (*real_statx)           (int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf);
-+static int          (*real_statx)           (int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf) __attribute__((unused));
- #endif
--static time_t       (*real_time)            (time_t *);
-+static time_t       (*real_time)            (time_t *) __attribute__((unused));
- #ifndef __ANDROID__
- static int          (*real_ftime)           (struct timeb *);
- #endif
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.13.bb b/meta-oe/recipes-test/libfaketime/libfaketime_0.9.13.bb
deleted file mode 100644
index 22c908f335..0000000000
--- a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.13.bb
+++ /dev/null
@@ -1,30 +0,0 @@ 
-DESCRIPTION = "A library for faking the system time in user-space programs"
-SECTION = "libs"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCREV = "86b37fde2fed7336ea2d0c17928e3015a55d9b4a"
-
-SRC_URI = "git://github.com/wolfcw/libfaketime.git;branch=master;tag=v${PV};protocol=https \
-           file://0001-Mark-write-only-real_-pointers-as-unused.patch \
-"
-
-CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE"
-
-do_configure[noexec] = "1"
-
-do_compile () {
-    oe_runmake
-}
-
-do_install () {
-    install -d ${D}${libdir}/faketime
-    oe_libinstall -C src libfaketime ${D}${libdir}/faketime
-    install -d ${D}${bindir}
-    install -m 0755 src/faketime ${D}${bindir}
-}
-
-FILES:${PN} = "${bindir}/faketime ${libdir}/faketime/lib*${SOLIBS}"
-FILES:${PN}-dev += "${libdir}/faketime/lib*${SOLIBSDEV}"
-
-BBCLASSEXTEND = "native"