summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp/libzypp_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp_git.bb')
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 9375640a14..3a323e7e15 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev libproxy"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
13PV = "0.0-git${SRCPV}" 13PV = "0.0-git${SRCPV}"
14PR = "r22" 14PR = "r23"
15 15
16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ 16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
17 file://no-doc.patch \ 17 file://no-doc.patch \
@@ -24,6 +24,7 @@ SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
24 file://hardcode-lib-fix.patch \ 24 file://hardcode-lib-fix.patch \
25 file://close.patch \ 25 file://close.patch \
26 file://libzypp-rpm549.patch \ 26 file://libzypp-rpm549.patch \
27 file://cstdio.patch \
27 " 28 "
28 29
29SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" 30SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
@@ -32,7 +33,10 @@ SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
32SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch" 33SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
33 34
34# rpmdb2solv from sat-solver is run from libzypp 35# rpmdb2solv from sat-solver is run from libzypp
35RDEPENDS_${PN} = "sat-solver rpm-libs gzip gnupg" 36RDEPENDS_${PN} = "sat-solver rpm-libs gzip ${RDEPGNUPG}"
37
38RDEPGNUPG = "gnupg"
39RDEPGNUPG_libc-uclibc = ""
36 40
37PACKAGES =+ "${PN}-pkgmgt" 41PACKAGES =+ "${PN}-pkgmgt"
38 42
@@ -47,6 +51,8 @@ FILES_${PN}-pkgmgt = "${bindir}/package-manager \
47EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}" 51EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
48OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-pthread" 52OECMAKE_CXX_LINK_FLAGS_libc-uclibc += "-pthread"
49 53
54LDFLAGS += "-lpthread"
55
50PACKAGE_ARCH = "${MACHINE_ARCH}" 56PACKAGE_ARCH = "${MACHINE_ARCH}"
51 57
52AVOID_CONSTRUCTOR = "" 58AVOID_CONSTRUCTOR = ""