From 683a10384e6553dd90423a306809304bbc53f1c4 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 21 Feb 2013 18:19:56 +0100 Subject: geany: fix compile by removing extra check for c++ compiler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- ...001-configure.ac-remove-additional-c-test.patch | 47 ++++++++++++++++++++++ meta-oe/recipes-devtools/geany/geany_1.22.bb | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch (limited to 'meta-oe/recipes-devtools/geany') 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 new file mode 100644 index 0000000000..5166fece09 --- /dev/null +++ b/meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch @@ -0,0 +1,47 @@ +From e62d5b59262ec7ffe07931790712c7e247377795 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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.22.bb b/meta-oe/recipes-devtools/geany/geany_1.22.bb index 1e56ec8e0e..e0b5df509b 100644 --- a/meta-oe/recipes-devtools/geany/geany_1.22.bb +++ b/meta-oe/recipes-devtools/geany/geany_1.22.bb @@ -3,10 +3,14 @@ HOMEPAGE = "http://www.geany.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c107cf754550e65755c42985a5d4e9c9" DEPENDS = "gtk+" +PR = "r1" inherit autotools pkgconfig -SRC_URI = "http://download.geany.org/${PN}-${PV}.tar.bz2" +SRC_URI = " \ + http://download.geany.org/${PN}-${PV}.tar.bz2 \ + file://0001-configure.ac-remove-additional-c-test.patch \ +" SRC_URI[md5sum] = "0672077fe83e2a739aa0eaca426aacf0" SRC_URI[sha256sum] = "901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e" -- cgit 1.2.3-korg