diff options
Diffstat (limited to 'meta/recipes-devtools/subversion')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/disable_macos.patch | 71 | ||||
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.14.3.bb (renamed from meta/recipes-devtools/subversion/subversion_1.12.2.bb) | 20 |
3 files changed, 10 insertions, 110 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch b/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch deleted file mode 100644 index 5a1b10b2e1..0000000000 --- a/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cbcfe0399347989e45a8fb695f55c855d6b3da72 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 7 Dec 2015 17:11:02 +0200 -Subject: [PATCH] Fix libtool name in configure.ac - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4ed66d4..ceb64f9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -221,8 +221,8 @@ if test "$experimental_libtool" = "yes"; then - 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) - --- -2.6.2 - diff --git a/meta/recipes-devtools/subversion/subversion/disable_macos.patch b/meta/recipes-devtools/subversion/subversion/disable_macos.patch deleted file mode 100644 index 8d2d635992..0000000000 --- a/meta/recipes-devtools/subversion/subversion/disable_macos.patch +++ /dev/null @@ -1,71 +0,0 @@ -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] - -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]) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -- #include <mach-o/dyld.h> -- #include <mach-o/loader.h> -- ]],[[ -- const struct mach_header *header = _dyld_get_image_header(0); -- const char *name = _dyld_get_image_name(0); -- if (name && header) return 0; -- return 1; -- ]])],[ -- AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], -- [Is Mach-O low-level _dyld API available?]) -- AC_MSG_RESULT([yes]) -- ],[ - AC_MSG_RESULT([no]) -- ]) - ]) - - dnl SVN_LIB_MACOS_PLIST -@@ -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]) -- -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -- #include <AvailabilityMacros.h> -- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \ -- || !defined(MAC_OS_X_VERSION_10_0) \ -- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0) -- #error ProperyList API unavailable. -- #endif -- ]],[[]])],[ -- 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_1.12.2.bb b/meta/recipes-devtools/subversion/subversion_1.14.3.bb index 4ffa1c584e..1cf4e1734b 100644 --- a/meta/recipes-devtools/subversion/subversion_1.12.2.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.3.bb @@ -1,22 +1,20 @@ 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 & MIT" +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" +DEPENDS:append:class-native = " file-replacement-native" SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://disable_macos.patch \ - file://0001-Fix-libtool-name-in-configure.ac.patch \ file://serfmacro.patch \ " -SRC_URI[md5sum] = "1ff249f848f834ded88536543e031975" -SRC_URI[sha256sum] = "3bd0b5c8e4c5175263dc9a92fd9aef94ce917e80af034f26fe5c45fde7e0f771" +SRC_URI[sha256sum] = "949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440" -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext python3native CVE_PRODUCT = "apache:subversion" @@ -37,12 +35,14 @@ EXTRA_OECONF = " \ 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 () { +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 @@ -56,6 +56,6 @@ do_configure_prepend () { #| make: *** [install-serf-lib] Error 1 PARALLEL_MAKEINST = "" -RDEPENDS_${PN} = "serf" +RDEPENDS:${PN} = "serf" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" |