Initial commit
This commit is contained in:
Your Name
@@ -0,0 +1,31 @@
|
||||
The existing sed expression can match expressions like
|
||||
--sysroot=/some/path/xxx-linux/ which clearly isn't intended and injects
|
||||
incorrect paths into LDFLAGS.
|
||||
|
||||
Fix this in the same way we address the problem in CFLAGS.
|
||||
|
||||
RP 2016/12/7
|
||||
Upstream-Status: Pending
|
||||
|
||||
Rebase 1.12.0
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
build/ac-macros/serf.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
|
||||
index 0a549b3..3a069ac 100644
|
||||
--- a/build/ac-macros/serf.m4
|
||||
+++ b/build/ac-macros/serf.m4
|
||||
@@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
|
||||
SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
|
||||
SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`]
|
||||
dnl don't use --libs-only-L because then we might miss some options
|
||||
- LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
|
||||
+ LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/ -l[^ ]*//g' -e 's/^-l[^ ]*//g'`"]
|
||||
break
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
SUMMARY = "Subversion (svn) version control system client"
|
||||
HOMEPAGE = "http://subversion.apache.org"
|
||||
DESCRIPTION = "Subversion is an open source version control system."
|
||||
SECTION = "console/network"
|
||||
LICENSE = "Apache-2.0 & MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b"
|
||||
|
||||
DEPENDS = "apr-util serf sqlite3 file lz4"
|
||||
DEPENDS:append:class-native = " file-replacement-native"
|
||||
|
||||
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||
file://serfmacro.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28"
|
||||
|
||||
inherit autotools pkgconfig gettext python3native
|
||||
|
||||
CVE_PRODUCT = "apache:subversion"
|
||||
|
||||
PACKAGECONFIG ?= ""
|
||||
|
||||
PACKAGECONFIG[boost] = "--with-boost=${RECIPE_SYSROOT}${exec_prefix},--without-boost,boost"
|
||||
PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl"
|
||||
PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring,--without-gnome-keyring,glib-2.0 gnome-keyring"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--with-apr=${STAGING_BINDIR_CROSS} \
|
||||
--with-apr-util=${STAGING_BINDIR_CROSS} \
|
||||
--without-apxs \
|
||||
--without-berkeley-db \
|
||||
--without-swig \
|
||||
--disable-keychain \
|
||||
--with-utf8proc=internal \
|
||||
ac_cv_path_RUBY=none \
|
||||
"
|
||||
|
||||
EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig"
|
||||
|
||||
acpaths = "-I build/ -I build/ac-macros/"
|
||||
|
||||
CPPFLAGS += "-P"
|
||||
BUILD_CPPFLAGS += "-P"
|
||||
|
||||
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
|
||||
rm -f ${S}/aclocal.m4
|
||||
sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
|
||||
}
|
||||
|
||||
#| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_local/libsvn_ra_local-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| /usr/bin/ld: cannot find -lsvn_delta-1| collect2: ld returned 1 exit status| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_svn/libsvn_ra_svn-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_serf/libsvn_ra_serf-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'
|
||||
#| x86_64-linux-libtool: install: error: relink `libsvn_ra_serf-1.la' with the above command before installing it
|
||||
#| x86_64-linux-libtool: install: warning: `../../subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'
|
||||
#| /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 nativesdk"
|
||||
Reference in New Issue
Block a user