Patchwork [meta-oe] geany: fix compile by removing extra check for c++ compiler

login
register
mail settings
Submitter Andreas Müller
Date Feb. 27, 2013, 7:30 a.m.
Message ID <1361950224-26188-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/45197/
State Accepted, archived
Commit 683a10384e6553dd90423a306809304bbc53f1c4
Headers show

Comments

Andreas Müller - Feb. 27, 2013, 7:30 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...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 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch
Martin Jansa - Feb. 28, 2013, 11:51 p.m.
On Wed, Feb 27, 2013 at 08:30:24AM +0100, Andreas Müller wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

Thanks, now it fails a bit later:
| configure:17392: checking for perl >= 5.8.1
| configure:17399: result: 5.14.2
| configure:17403: checking for XML::Parser
| configure:17409: error: XML::Parser perl module is required for intltool

Complete log:
http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130228_192523.log/

> ---
>  ...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 deletions(-)
>  create mode 100644 meta-oe/recipes-devtools/geany/geany/0001-configure.ac-remove-additional-c-test.patch
> 
> 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 0000000..5166fec
> --- /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?= <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.22.bb b/meta-oe/recipes-devtools/geany/geany_1.22.bb
> index 1e56ec8..e0b5df5 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"
>  
> -- 
> 1.7.6.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Andreas Müller - March 1, 2013, 12:24 a.m.
On Fri, Mar 1, 2013 at 12:51 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Feb 27, 2013 at 08:30:24AM +0100, Andreas Müller wrote:
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>
> Thanks, now it fails a bit later:
> | configure:17392: checking for perl >= 5.8.1
> | configure:17399: result: 5.14.2
> | configure:17403: checking for XML::Parser
> | configure:17409: error: XML::Parser perl module is required for intltool
>
> Complete log:
> http://logs.nslu2-linux.org/buildlogs/oe/oe-shr-core-branches/log.world.20130228_192523.log/
>
Another chapter of success-stroies :)

Will check that next week

Andreas

Patch

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 0000000..5166fec
--- /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?= <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.22.bb b/meta-oe/recipes-devtools/geany/geany_1.22.bb
index 1e56ec8..e0b5df5 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"