diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2018-05-02 15:12:49 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-11 07:49:00 +0100 |
| commit | 10cb7bccc2452375b363ba82bf1be2ee0cb0e8e2 (patch) | |
| tree | 59f8f6b0d2790db1d01f1ac3a6372d96a9fd4364 | |
| parent | eb1eacefafcbf69e48f906234f5016ae18f0bdce (diff) | |
| download | openembedded-core-contrib-10cb7bccc2452375b363ba82bf1be2ee0cb0e8e2.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
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.9.7.bb | 37 |
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 @@ SUMMARY = "Subversion (svn) version control system client" +HOMEPAGE = "http://subversion.tigris.org" SECTION = "console/network" -DEPENDS = "apr-util serf sqlite3 file" -DEPENDS_append_class-native = " file-replacement-native" -RDEPENDS_${PN} = "serf" LICENSE = "Apache-2" -HOMEPAGE = "http://subversion.tigris.org" - -BBCLASSEXTEND = "native" +LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709" -inherit gettext pkgconfig +DEPENDS = "apr-util serf sqlite3 file" +DEPENDS_append_class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://disable_macos.patch \ @@ -20,26 +17,28 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "05b0c677681073920f938c1f322e0be2" SRC_URI[sha256sum] = "c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623" -LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709" +inherit autotools pkgconfig gettext + +PACKAGECONFIG ?= "" PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl" PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring,--without-gnome-keyring,glib-2.0 gnome-keyring" EXTRA_OECONF = " \ - --without-berkeley-db --without-apxs \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS} \ - --disable-keychain \ - ac_cv_path_RUBY=none" + --with-apr=${STAGING_BINDIR_CROSS} \ + --with-apr-util=${STAGING_BINDIR_CROSS} \ + --without-apxs \ + --without-berkeley-db \ + --without-swig \ + --disable-keychain \ + ac_cv_path_RUBY=none \ +" -inherit autotools +acpaths = "-I build/ -I build/ac-macros/" -export LDFLAGS += " -L${STAGING_LIBDIR} " CPPFLAGS += "-P" BUILD_CPPFLAGS += "-P" -acpaths = "-I build/ -I build/ac-macros/" - do_configure_prepend () { rm -f ${S}/libtool 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 () { #| /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 #| make: *** [install-serf-lib] Error 1 PARALLEL_MAKEINST = "" + +RDEPENDS_${PN} = "serf" + +BBCLASSEXTEND = "native" |