diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2014-04-12 20:14:09 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-04-20 13:14:56 +0200 |
commit | 2bc68c32cb52ae30b31caf921ef38f9fee9aa4ac (patch) | |
tree | a80910cfe906b3b46abd4d41bc3b4d3b5139e27e | |
parent | 84d2791e40a359a8f6c360f6ed1d6476f4b8d46e (diff) | |
download | meta-openembedded-2bc68c32cb52ae30b31caf921ef38f9fee9aa4ac.tar.gz |
vim: Upgrade to v7.4.258
The patch against configure.in was resubmitted to the vim mailing list and was
merged into the upstream sources so is no longer needed.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch | 17 | ||||
-rw-r--r-- | meta-oe/recipes-support/vim/vim_7.4.258.bb (renamed from meta-oe/recipes-support/vim/vim_7.4.155.bb) | 5 |
2 files changed, 2 insertions, 20 deletions
diff --git a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch b/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch deleted file mode 100644 index c8cfe8ee0d..0000000000 --- a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | upstream: http://groups.google.com/group/vim_dev/browse_thread/thread/5685c3b859e3c793# | ||
2 | status: reported upstream | ||
3 | --- vim72-orig/src/configure.in 2010-09-29 19:13:33.000000000 +0200 | ||
4 | +++ vim72/src/configure.in 2010-09-29 19:17:07.000000000 +0200 | ||
5 | @@ -35,10 +35,10 @@ | ||
6 | fi | ||
7 | if test "$GCC" = yes; then | ||
8 | dnl method that should work for nearly all versions | ||
9 | - gccversion=`"$CC" -dumpversion` | ||
10 | + gccversion=`$CC -dumpversion` | ||
11 | if test "x$gccversion" = "x"; then | ||
12 | dnl old method; fall-back for when -dumpversion doesn't work | ||
13 | - gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` | ||
14 | + gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'` | ||
15 | fi | ||
16 | dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki | ||
17 | if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then | ||
diff --git a/meta-oe/recipes-support/vim/vim_7.4.155.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb index 0d98e7a1f9..878c79e74f 100644 --- a/meta-oe/recipes-support/vim/vim_7.4.155.bb +++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb | |||
@@ -6,9 +6,8 @@ RSUGGESTS_${PN} = "diffutils" | |||
6 | LICENSE = "vim" | 6 | LICENSE = "vim" |
7 | LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8" | 7 | LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8" |
8 | 8 | ||
9 | SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \ | 9 | SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim" |
10 | file://configure.in_remove_CC_quotes.patch;patchdir=.." | 10 | SRCREV = "v7-4-258" |
11 | SRCREV = "v7-4-155" | ||
12 | 11 | ||
13 | S = "${WORKDIR}/${PN}/src" | 12 | S = "${WORKDIR}/${PN}/src" |
14 | 13 | ||