From eaedf2e9410a08ff3594b0ec23c543c74ed1e85b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 May 2012 15:51:52 -0700 Subject: rpm: Fix compilation on uclibc rpmatch is not there in uclibc therefore add logic to configure to detect it. x* wrappers need to be defined for uclibc as well. (From OE-Core rev: 0cd3a4f3cfd0eb70915e3b59be8d04ee2d92749e) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm/rpmatch.patch | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/rpmatch.patch (limited to 'meta/recipes-devtools/rpm/rpm/rpmatch.patch') diff --git a/meta/recipes-devtools/rpm/rpm/rpmatch.patch b/meta/recipes-devtools/rpm/rpm/rpmatch.patch new file mode 100644 index 0000000000..8ea349003a --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpmatch.patch @@ -0,0 +1,42 @@ +Add configure check for rpmatch() and +creates a compatable macro if it is not provided by the C library. + +This is needed for uclibc since it does not have the above function +implemented. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: rpm-5.4.0/configure.ac +=================================================================== +--- rpm-5.4.0.orig/configure.ac 2012-05-31 15:40:05.985990822 -0700 ++++ rpm-5.4.0/configure.ac 2012-05-31 15:41:15.601995311 -0700 +@@ -800,7 +800,7 @@ + ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl + getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl + lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl +- posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl ++ posix_fadvise posix_fallocate putenv realpath regcomp rpmatch __secure_getenv dnl + setattrlist setenv setlocale setmode setxattr dnl + sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl + sigprocmask sigsuspend sigaction dnl +Index: rpm-5.4.0/system.h +=================================================================== +--- rpm-5.4.0.orig/system.h 2012-05-31 15:40:05.997991504 -0700 ++++ rpm-5.4.0/system.h 2012-05-31 15:42:04.941997731 -0700 +@@ -410,6 +410,14 @@ + #endif /* defined(__GNUC__) */ + #endif /* HAVE_MCHECK_H */ + ++#ifndef HAVE_RPMATCH ++#define rpmatch(line) \ ++ ( (line == NULL)? -1 : \ ++ (*line == 'y' || *line == 'Y')? 1 : \ ++ (*line == 'n' || *line == 'N')? 0 : \ ++ -1 ) ++#endif ++ + /* Retrofit glibc __progname */ + #if defined __GLIBC__ && __GLIBC__ >= 2 + #if __GLIBC_MINOR__ >= 1 -- cgit v1.2.3-54-g00ecf