summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/subversion/subversion_1.9.7.bb
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-02 15:12:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-11 07:49:37 +0100
commit1d44f1f1577f386ff8f16627f3812d4c5b93f8c9 (patch)
tree3f956b1035da0801faf59c6705aca5d15ffea444 /meta/recipes-devtools/subversion/subversion_1.9.7.bb
parent800f2d7b3be29b12a988ff08a99794146fd440ad (diff)
downloadpoky-1d44f1f1577f386ff8f16627f3812d4c5b93f8c9.tar.gz
subversion: misc recipe cleanup
- Add default value for PACKAGECONFIG - Combine "inherit autotools" with "inherit pkgconfig gettext" - Drop historical addition of -L${STAGING_LIBDIR} to LDFLAGS - Re-order variables according to OE styleguide (From OE-Core rev: 10cb7bccc2452375b363ba82bf1be2ee0cb0e8e2) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion_1.9.7.bb')
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.9.7.bb37
1 files changed, 20 insertions, 17 deletions
diff --git a/meta/recipes-devtools/subversion/subversion_1.9.7.bb b/meta/recipes-devtools/subversion/subversion_1.9.7.bb
index 57735f7f86..da9de9d5b9 100644
--- a/meta/recipes-devtools/subversion/subversion_1.9.7.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.9.7.bb
@@ -1,14 +1,11 @@
1SUMMARY = "Subversion (svn) version control system client" 1SUMMARY = "Subversion (svn) version control system client"
2HOMEPAGE = "http://subversion.tigris.org"
2SECTION = "console/network" 3SECTION = "console/network"
3DEPENDS = "apr-util serf sqlite3 file"
4DEPENDS_append_class-native = " file-replacement-native"
5RDEPENDS_${PN} = "serf"
6LICENSE = "Apache-2" 4LICENSE = "Apache-2"
7HOMEPAGE = "http://subversion.tigris.org" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709"
8
9BBCLASSEXTEND = "native"
10 6
11inherit gettext pkgconfig 7DEPENDS = "apr-util serf sqlite3 file"
8DEPENDS_append_class-native = " file-replacement-native"
12 9
13SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 10SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
14 file://disable_macos.patch \ 11 file://disable_macos.patch \
@@ -20,26 +17,28 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
20SRC_URI[md5sum] = "05b0c677681073920f938c1f322e0be2" 17SRC_URI[md5sum] = "05b0c677681073920f938c1f322e0be2"
21SRC_URI[sha256sum] = "c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623" 18SRC_URI[sha256sum] = "c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623"
22 19
23LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709" 20inherit autotools pkgconfig gettext
21
22PACKAGECONFIG ?= ""
24 23
25PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl" 24PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
26PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring,--without-gnome-keyring,glib-2.0 gnome-keyring" 25PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring,--without-gnome-keyring,glib-2.0 gnome-keyring"
27 26
28EXTRA_OECONF = " \ 27EXTRA_OECONF = " \
29 --without-berkeley-db --without-apxs \ 28 --with-apr=${STAGING_BINDIR_CROSS} \
30 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ 29 --with-apr-util=${STAGING_BINDIR_CROSS} \
31 --with-apr-util=${STAGING_BINDIR_CROSS} \ 30 --without-apxs \
32 --disable-keychain \ 31 --without-berkeley-db \
33 ac_cv_path_RUBY=none" 32 --without-swig \
33 --disable-keychain \
34 ac_cv_path_RUBY=none \
35"
34 36
35inherit autotools 37acpaths = "-I build/ -I build/ac-macros/"
36 38
37export LDFLAGS += " -L${STAGING_LIBDIR} "
38CPPFLAGS += "-P" 39CPPFLAGS += "-P"
39BUILD_CPPFLAGS += "-P" 40BUILD_CPPFLAGS += "-P"
40 41
41acpaths = "-I build/ -I build/ac-macros/"
42
43do_configure_prepend () { 42do_configure_prepend () {
44 rm -f ${S}/libtool 43 rm -f ${S}/libtool
45 rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4 44 rm -f ${S}/build/libtool.m4 ${S}/build/ltmain.sh ${S}/build/ltoptions.m4 ${S}/build/ltsugar.m4 ${S}/build/ltversion.m4 ${S}/build/lt~obsolete.m4
@@ -53,3 +52,7 @@ do_configure_prepend () {
53#| /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/subversion-1.8.9/build-outputs.mk:1090: recipe for target 'install-serf-lib' failed 52#| /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/subversion-1.8.9/build-outputs.mk:1090: recipe for target 'install-serf-lib' failed
54#| make: *** [install-serf-lib] Error 1 53#| make: *** [install-serf-lib] Error 1
55PARALLEL_MAKEINST = "" 54PARALLEL_MAKEINST = ""
55
56RDEPENDS_${PN} = "serf"
57
58BBCLASSEXTEND = "native"