mirror of
https://git.yoctoproject.org/poky
synced 2026-02-24 18:39:40 +01:00
3c6b603bc7
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. This fixes corrupt build paths and incorrect paths in .la files amongst other issues. (From OE-Core rev: 9a8382422ddbb0972dc25b752204f4908bb9857c) (From OE-Core rev: 980140fc0735df66592c09acda9686386711f2b5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
57 lines
3.8 KiB
BlitzBasic
57 lines
3.8 KiB
BlitzBasic
SUMMARY = "Subversion (svn) version control system client"
|
|
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"
|
|
|
|
inherit gettext
|
|
|
|
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
|
file://disable_macos.patch \
|
|
file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
|
|
file://0001-Fix-libtool-name-in-configure.ac.patch \
|
|
file://0001-fix-svnadmin-create-fail-on-x86.patch \
|
|
file://serfmacro.patch \
|
|
"
|
|
|
|
SRC_URI[md5sum] = "29121a038f87641055a8183f49e9739f"
|
|
SRC_URI[sha256sum] = "1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299"
|
|
|
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=af81ae49ba359e70626c05e9bf313709"
|
|
|
|
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"
|
|
|
|
inherit autotools
|
|
|
|
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
|
|
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 = ""
|