diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2016-12-22 23:33:34 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-26 08:24:58 +0100 |
| commit | f961e013a1a2cf4a18e39e5f6b6b73767226070d (patch) | |
| tree | 8e2ec2cc4174622e9d66f8aa06606bdbc3a092fa /meta-oe | |
| parent | 0479750314b02337e47d40b88bb35fbf9116132e (diff) | |
| download | meta-openembedded-contrib-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')
| -rw-r--r-- | meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch | 47 | ||||
| -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 5166fece09..0000000000 --- a/meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e62d5b59262ec7ffe07931790712c7e247377795 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 21 Feb 2013 09:31:31 +0100 -Subject: [PATCH] configure.ac remove additional c++ test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For openembedded cross-builds CXX can contain something like: - -arm-oe-linux-gnueabi-g++ -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm - -This ends up in - -configure:5582: error: No C++ compiler found. Please install a C++ compiler. - -Anyway if [1] is still valid, the combination of AC_PROG_CC and AC_PROG_CXX -should thow an error message. - -[1] http://lists.gnu.org/archive/html/bug-autoconf/2010-05/msg00001.html - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c37312a..742bf35 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,11 +26,6 @@ AC_USE_SYSTEM_EXTENSIONS - AC_PROG_CC - - AC_PROG_CXX --# check for C++ compiler explicitly and fail if none is found, do this check --# after AC_PROG_CXX has set the CXX environment variable --if ! which $CXX >/dev/null 2>&1; then -- AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.]) --fi - - AC_PROG_INSTALL - AC_PROG_LN_S --- -1.7.6.5 - diff --git a/meta-oe/recipes-devtools/geany/geany_1.28.bb b/meta-oe/recipes-devtools/geany/geany_1.29.bb index da97090a4c..db6a34a04a 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" inherit autotools pkgconfig perlnative pythonnative -SRC_URI = " \ - http://download.geany.org/${BP}.tar.bz2 \ - file://0001-configure.ac-remove-additional-c-test.patch \ -" -SRC_URI[md5sum] = "39a29deb598e9e3503ee7d9d5fb51a34" -SRC_URI[sha256sum] = "f73a3708f1a26e9bf72da564d5037d6f7fedca2e0d6175db0681c2b672100a5a" +SRC_URI = "http://download.geany.org/${BP}.tar.bz2" +SRC_URI[md5sum] = "9b62a443461cc917b41c94fa7d58fdb1" +SRC_URI[sha256sum] = "394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f" FILES_${PN} += "${datadir}/icons" |