summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/geany
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2016-12-22 23:33:34 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-26 08:24:58 +0100
commitf961e013a1a2cf4a18e39e5f6b6b73767226070d (patch)
tree8e2ec2cc4174622e9d66f8aa06606bdbc3a092fa /meta-oe/recipes-devtools/geany
parent0479750314b02337e47d40b88bb35fbf9116132e (diff)
downloadmeta-openembedded-f961e013a1a2cf4a18e39e5f6b6b73767226070d.tar.gz
geany: update to 1.29
0001-configure.ac-remove-additional-c-test.patch: additional compiler check is gone Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/geany')
-rw-r--r--meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch47
-rw-r--r--meta-oe/recipes-devtools/geany/geany_1.29.bb (renamed from meta-oe/recipes-devtools/geany/geany_1.28.bb)9
2 files changed, 3 insertions, 53 deletions
diff --git a/meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch b/meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch
deleted file mode 100644
index 5166fece0..000000000
--- a/meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From e62d5b59262ec7ffe07931790712c7e247377795 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Thu, 21 Feb 2013 09:31:31 +0100
4Subject: [PATCH] configure.ac remove additional c++ test
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9For openembedded cross-builds CXX can contain something like:
10
11arm-oe-linux-gnueabi-g++ -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm
12
13This ends up in
14
15configure:5582: error: No C++ compiler found. Please install a C++ compiler.
16
17Anyway if [1] is still valid, the combination of AC_PROG_CC and AC_PROG_CXX
18should thow an error message.
19
20[1] http://lists.gnu.org/archive/html/bug-autoconf/2010-05/msg00001.html
21
22Upstream-Status: Inappropriate [configuration]
23
24Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
25---
26 configure.ac | 5 -----
27 1 files changed, 0 insertions(+), 5 deletions(-)
28
29diff --git a/configure.ac b/configure.ac
30index c37312a..742bf35 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -26,11 +26,6 @@ AC_USE_SYSTEM_EXTENSIONS
34 AC_PROG_CC
35
36 AC_PROG_CXX
37-# check for C++ compiler explicitly and fail if none is found, do this check
38-# after AC_PROG_CXX has set the CXX environment variable
39-if ! which $CXX >/dev/null 2>&1; then
40- AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.])
41-fi
42
43 AC_PROG_INSTALL
44 AC_PROG_LN_S
45--
461.7.6.5
47
diff --git a/meta-oe/recipes-devtools/geany/geany_1.28.bb b/meta-oe/recipes-devtools/geany/geany_1.29.bb
index da97090a4..db6a34a04 100644
--- a/meta-oe/recipes-devtools/geany/geany_1.28.bb
+++ b/meta-oe/recipes-devtools/geany/geany_1.29.bb
@@ -6,12 +6,9 @@ DEPENDS = "gtk+ python3-docutils-native"
6 6
7inherit autotools pkgconfig perlnative pythonnative 7inherit autotools pkgconfig perlnative pythonnative
8 8
9SRC_URI = " \ 9SRC_URI = "http://download.geany.org/${BP}.tar.bz2"
10 http://download.geany.org/${BP}.tar.bz2 \ 10SRC_URI[md5sum] = "9b62a443461cc917b41c94fa7d58fdb1"
11 file://0001-configure.ac-remove-additional-c-test.patch \ 11SRC_URI[sha256sum] = "394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f"
12"
13SRC_URI[md5sum] = "39a29deb598e9e3503ee7d9d5fb51a34"
14SRC_URI[sha256sum] = "f73a3708f1a26e9bf72da564d5037d6f7fedca2e0d6175db0681c2b672100a5a"
15 12
16FILES_${PN} += "${datadir}/icons" 13FILES_${PN} += "${datadir}/icons"
17 14