diff options
Diffstat (limited to 'meta/recipes-devtools/subversion')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/disable_macos.patch (renamed from meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch) | 45 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/serfmacro.patch | 31 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.14.1.bb (renamed from meta/recipes-devtools/subversion/subversion_1.8.13.bb) | 56 |
5 files changed, 88 insertions, 91 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch deleted file mode 100644 index 5cd572bfc8..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.8.13/libtool2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - ---- a/configure.ac 2011-10-20 21:56:02.230663987 +0200 -+++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200 -@@ -227,8 +227,8 @@ - LIBTOOL="$sh_libtool" - SVN_LIBTOOL="$sh_libtool" - else -- sh_libtool="$abs_builddir/libtool" -- SVN_LIBTOOL="\$(SHELL) $sh_libtool" -+ sh_libtool="$abs_builddir/$host_alias-libtool" -+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool" - fi - AC_SUBST(SVN_LIBTOOL) - diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch deleted file mode 100644 index 140e522627..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f1b6e49f12a18eabe88eb732b578a16281d09499 Mon Sep 17 00:00:00 2001 -From: Jose Lamego <jose.a.lamego@linux.intel.com> -Date: Thu, 2 Jul 2015 11:37:43 +0000 -Subject: [PATCH] serf.m4: Regex modified to allow '-D' in paths - -Upstream-Status: Accepted - -The patch is merged by subversion upstream with replacing '[[:space:]]' with ' '. - -http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?r1=1594156&r2=1689824 - -Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.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 ae11e75..ff8cbae 100644 ---- a/build/ac-macros/serf.m4 -+++ b/build/ac-macros/serf.m4 -@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, - if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then - AC_MSG_RESULT([yes]) - serf_found=yes -- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`] -+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`] - SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` - break - else --- -1.8.4.5 - diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch b/meta/recipes-devtools/subversion/subversion/disable_macos.patch index ec3be496f3..8d2d635992 100644 --- a/meta/recipes-devtools/subversion/subversion-1.8.13/disable_macos.patch +++ b/meta/recipes-devtools/subversion/subversion/disable_macos.patch @@ -1,15 +1,25 @@ -These tests don't work in cross compiling, just disable them for now, we don't -build subversion on OS-X at this time. +From 9c350c037ca3489dbeece6ecc2d7e2e5dbb177e9 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 11 May 2019 15:21:46 +0800 +Subject: [PATCH] These tests don't work in cross compiling, just disable them + for now, we don't build subversion on OS-X at this time. RP 1014/7/16 Upstream-Status: Pending [needs a rewrite to support a cache value] -Index: subversion-1.8.9/build/ac-macros/macosx.m4 -=================================================================== ---- subversion-1.8.9.orig/build/ac-macros/macosx.m4 2012-11-26 03:04:27.000000000 +0000 -+++ subversion-1.8.9/build/ac-macros/macosx.m4 2014-07-16 12:28:58.357300403 +0000 -@@ -24,21 +24,7 @@ +Rebase to 1.12.0 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/ac-macros/macosx.m4 | 31 +------------------------------ + 1 file changed, 1 insertion(+), 30 deletions(-) + +diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4 +index 92fa58e..a568e1c 100644 +--- a/build/ac-macros/macosx.m4 ++++ b/build/ac-macros/macosx.m4 +@@ -24,21 +24,7 @@ dnl Check for _dyld_image_name and _dyld_image_header availability AC_DEFUN(SVN_LIB_MACHO_ITERATE, [ AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) @@ -31,7 +41,7 @@ Index: subversion-1.8.9/build/ac-macros/macosx.m4 ]) dnl SVN_LIB_MACOS_PLIST -@@ -46,34 +32,7 @@ +@@ -46,23 +32,8 @@ dnl Assign variables for Mac OS property list support AC_DEFUN(SVN_LIB_MACOS_PLIST, [ AC_MSG_CHECKING([for Mac OS property list utilities]) @@ -44,25 +54,18 @@ Index: subversion-1.8.9/build/ac-macros/macosx.m4 - #error ProperyList API unavailable. - #endif - ]],[[]])],[ -- dnl ### Hack. We should only need to pass the -framework options when -- dnl linking libsvn_subr, since it is the only library that uses Keychain. -- dnl -- dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for -- dnl OS X frameworks like it does for normal libraries, so we need to -- dnl explicitly pass the option to all the users of libsvn_subr to allow -- dnl static builds to link successfully. -- dnl -- dnl This does mean that all executables we link will be linked directly -- dnl to these frameworks - even when building shared libraries - but that -- dnl shouldn't cause any problems. -- -- LIBS="$LIBS -framework CoreFoundation" +- SVN_MACOS_PLIST_LIBS="-framework CoreFoundation" +- AC_SUBST(SVN_MACOS_PLIST_LIBS) - AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], - [Is Mac OS property list API available?]) - AC_MSG_RESULT([yes]) - ],[ ++ AC_SUBST([SVN_MACOS_PLIST_LIBS], [""]) AC_MSG_RESULT([no]) - ]) ]) dnl SVN_LIB_MACOS_KEYCHAIN +-- +2.7.4 + diff --git a/meta/recipes-devtools/subversion/subversion/serfmacro.patch b/meta/recipes-devtools/subversion/subversion/serfmacro.patch new file mode 100644 index 0000000000..507de0f08b --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/serfmacro.patch @@ -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 + diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.14.1.bb index f843b9513c..71183ac7ce 100644 --- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.1.bb @@ -1,43 +1,49 @@ SUMMARY = "Subversion (svn) version control system client" +HOMEPAGE = "http://subversion.apache.org" +DESCRIPTION = "Subversion is an open source version control system." SECTION = "console/network" -DEPENDS = "apr-util serf sqlite3 file" -RDEPENDS_${PN} = "serf" -LICENSE = "Apache-2" -HOMEPAGE = "http://subversion.tigris.org" +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b" -BBCLASSEXTEND = "native" - -inherit gettext pythonnative +DEPENDS = "apr-util serf sqlite3 file lz4" +DEPENDS:append:class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://libtool2.patch \ file://disable_macos.patch \ - file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \ -" -SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b" -SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579" + file://serfmacro.patch \ + " + +SRC_URI[sha256sum] = "2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1c2f0119e478700b5428e26386cff923" +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 = " \ - --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 \ + --with-utf8proc=internal \ + ac_cv_path_RUBY=none \ +" -inherit autotools +EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig" + +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 () { +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 @@ -50,3 +56,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 nativesdk" |