diff options
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp_git.bb')
-rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 824f7a1339..6555bd4044 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb | |||
@@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver" | |||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" | 15 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" |
16 | PV = "0.0-git${SRCPV}" | 16 | PV = "0.0-git${SRCPV}" |
17 | PR = "r10" | 17 | PR = "r11" |
18 | 18 | ||
19 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ | 19 | SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ |
20 | file://no-doc.patch \ | 20 | file://no-doc.patch \ |
@@ -23,6 +23,7 @@ SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ | |||
23 | file://config-release.patch \ | 23 | file://config-release.patch \ |
24 | file://libzypp-pokyarch.patch \ | 24 | file://libzypp-pokyarch.patch \ |
25 | file://fix_for_compile_wth_gcc-4.6.0.patch \ | 25 | file://fix_for_compile_wth_gcc-4.6.0.patch \ |
26 | file://hardcode-lib-fix.patch \ | ||
26 | " | 27 | " |
27 | 28 | ||
28 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" | 29 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" |
@@ -33,7 +34,7 @@ SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch" | |||
33 | FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" | 34 | FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" |
34 | FILES_${PN}-dev += "${datadir}/cmake" | 35 | FILES_${PN}-dev += "${datadir}/cmake" |
35 | 36 | ||
36 | EXTRA_OECMAKE += "-DLIB=lib" | 37 | EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}" |
37 | 38 | ||
38 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 39 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
39 | 40 | ||