summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/subversion
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-12-10 14:22:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-12 18:10:22 +0000
commitcd5aa858a8a6133f1e6f419f2c00ff27be90c7eb (patch)
tree67f3d000ccfd475e9ada6070974c6a5f880ff09f /meta/recipes-devtools/subversion
parent7f1e060882187dd2219df86ea37a9bb788158155 (diff)
downloadpoky-cd5aa858a8a6133f1e6f419f2c00ff27be90c7eb.tar.gz
subversion: remove obsolete support for renamed libtool
libtool is now longer renamed to ${host}-libtool, so remove the changes to support this. (From OE-Core rev: 0610df3e56e350493731d49fe67261b62d346573) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/subversion')
-rw-r--r--meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch29
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.14.1.bb1
2 files changed, 0 insertions, 30 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 @@
1From cbcfe0399347989e45a8fb695f55c855d6b3da72 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 7 Dec 2015 17:11:02 +0200
4Subject: [PATCH] Fix libtool name in configure.ac
5
6Upstream-Status: Inappropriate [embedded specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 configure.ac | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index 4ed66d4..ceb64f9 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -221,8 +221,8 @@ if test "$experimental_libtool" = "yes"; then
17 LIBTOOL="$sh_libtool"
18 SVN_LIBTOOL="$sh_libtool"
19 else
20- sh_libtool="$abs_builddir/libtool"
21- SVN_LIBTOOL="\$(SHELL) \"$sh_libtool\""
22+ sh_libtool="$abs_builddir/$host_alias-libtool"
23+ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
24 fi
25 AC_SUBST(SVN_LIBTOOL)
26
27--
282.6.2
29
diff --git a/meta/recipes-devtools/subversion/subversion_1.14.1.bb b/meta/recipes-devtools/subversion/subversion_1.14.1.bb
index 87dc359439..a0a9376f3d 100644
--- a/meta/recipes-devtools/subversion/subversion_1.14.1.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.14.1.bb
@@ -10,7 +10,6 @@ DEPENDS:append:class-native = " file-replacement-native"
10 10
11SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 11SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
12 file://disable_macos.patch \ 12 file://disable_macos.patch \
13 file://0001-Fix-libtool-name-in-configure.ac.patch \
14 file://serfmacro.patch \ 13 file://serfmacro.patch \
15 " 14 "
16 15