summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-06-06 18:28:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 17:26:48 +0100
commitc383a30aee2f28aaa33fc12900926d6d89290855 (patch)
treea6f597d570d67cefae1c8c6248f9a3eefd86c141 /meta
parent13136e4c2052075a6d5538fb963e675ec4ce1417 (diff)
downloadpoky-c383a30aee2f28aaa33fc12900926d6d89290855.tar.gz
zypper: Fix build on uclibc
uclibc does not have rpmatch() so we define it if zypper is being compiled for uclibc (From OE-Core rev: 1ea9b31f304e54ce4b7c2d38582d1775a46cd8c6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/zypper/zypper/rpmatch.patch23
-rw-r--r--meta/recipes-extended/zypper/zypper_git.bb2
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-extended/zypper/zypper/rpmatch.patch b/meta/recipes-extended/zypper/zypper/rpmatch.patch
new file mode 100644
index 0000000000..a750a3bd39
--- /dev/null
+++ b/meta/recipes-extended/zypper/zypper/rpmatch.patch
@@ -0,0 +1,23 @@
1rpmatch() is missing in uclibc so we provide a local definition
2in form of a macro
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Pending
6
7Index: git/src/utils/prompt.h
8===================================================================
9--- git.orig/src/utils/prompt.h 2012-06-06 15:51:00.899112775 -0700
10+++ git/src/utils/prompt.h 2012-06-06 15:52:17.003116762 -0700
11@@ -172,4 +172,12 @@
12 return errstr;
13 }
14
15+#ifdef __UCLIBC__
16+#define rpmatch(line) \
17+ ( (line == NULL)? -1 : \
18+ (*line == 'y' || *line == 'Y')? 1 : \
19+ (*line == 'n' || *line == 'N')? 0 : \
20+ -1 )
21+#endif /* __UCLIBC__ */
22+
23 #endif /*ZYPPERPROMPT_H_*/
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index 0a1df5d757..c5d7c61052 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -16,6 +16,7 @@ SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \
16 file://dso_linking_change_build_fix.patch \ 16 file://dso_linking_change_build_fix.patch \
17 file://rpm5-flag.patch \ 17 file://rpm5-flag.patch \
18 file://gcc-scope.patch \ 18 file://gcc-scope.patch \
19 file://rpmatch.patch \
19 " 20 "
20S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
21 22
@@ -25,3 +26,4 @@ RDEPENDS_${PN} = "rpm-libs"
25RRECOMMENDS_${PN} = "procps util-linux-uuidgen" 26RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
26 27
27PACKAGE_ARCH = "${MACHINE_ARCH}" 28PACKAGE_ARCH = "${MACHINE_ARCH}"
29OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-lintl"