* [PATCH][meta-oe] dialog: use pkg-config to detect ncurses
@ 2014-06-19 4:46 rongqing.li
2014-06-19 7:34 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: rongqing.li @ 2014-06-19 4:46 UTC (permalink / raw)
To: openembedded-devel
From: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
meta-oe/recipes-extended/dialog/dialog.inc | 6 ++-
.../use-pkg-config-for-ncurses-detection.patch | 40 ++++++++++++++++++++
2 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog.inc
index c1c28fd..995d6c0 100644
--- a/meta-oe/recipes-extended/dialog/dialog.inc
+++ b/meta-oe/recipes-extended/dialog/dialog.inc
@@ -8,12 +8,14 @@ DEPENDS = "ncurses"
LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz"
+SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \
+ file://use-pkg-config-for-ncurses-detection.patch \
+ "
# hardcoded here for use in dialog-static recipe
S = "${WORKDIR}/dialog-${PV}"
-inherit autotools
+inherit autotools-brokensep pkgconfig
EXTRA_OECONF = "--with-ncurses \
--disable-rpath-hack"
diff --git a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
new file mode 100644
index 0000000..b5b4b3c
--- /dev/null
+++ b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
@@ -0,0 +1,40 @@
+Subject: [PATCH] use pkg-config for ncurses detection.
+
+Upstream-Status: Inappropriate [configuration]
+
+This is a workaround to make dialog be able to build after ncurses-config
+does not work, since the configure file is called directly in dialog bb
+file, and autoconf can not work, make a workaround in configure file.
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 24e28c1..c78735d 100755
+--- a/configure
++++ b/configure
+@@ -9976,8 +9976,8 @@ fi
+
+ if test "$NCURSES_CONFIG" != none ; then
+
+-CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
+-LIBS="`$NCURSES_CONFIG --libs` $LIBS"
++CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>&1`"
++LIBS="`pkg-config --short-errors --print-errors --libs "ncurses" 2>&1` $LIBS"
+
+ # even with config script, some packages use no-override for curses.h
+
+@@ -10096,7 +10096,7 @@ cat >>confdefs.h <<EOF
+ #define $cf_nculib_ROOT 1
+ EOF
+
+-cf_cv_ncurses_version=`$NCURSES_CONFIG --version`
++cf_cv_ncurses_version=`pkg-config --short-errors --print-errors --modversion "ncurses"`
+
+ else
+
+--
+1.7.10.4
+
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH][meta-oe] dialog: use pkg-config to detect ncurses
2014-06-19 4:46 [PATCH][meta-oe] dialog: use pkg-config to detect ncurses rongqing.li
@ 2014-06-19 7:34 ` Koen Kooi
2014-06-19 8:23 ` Rongqing Li
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2014-06-19 7:34 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
rongqing.li@windriver.com schreef op 19-06-14 06:46:
> From: Roy Li <rongqing.li@windriver.com>
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com> ---
> meta-oe/recipes-extended/dialog/dialog.inc | 6 ++-
> .../use-pkg-config-for-ncurses-detection.patch | 40
> ++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-)
> create mode 100644
> meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
>
> diff --git a/meta-oe/recipes-extended/dialog/dialog.inc
> b/meta-oe/recipes-extended/dialog/dialog.inc index c1c28fd..995d6c0
> 100644 --- a/meta-oe/recipes-extended/dialog/dialog.inc +++
> b/meta-oe/recipes-extended/dialog/dialog.inc @@ -8,12 +8,14 @@ DEPENDS =
> "ncurses" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM =
> "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
>
> -SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz" +SRC_URI
> = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ +
> file://use-pkg-config-for-ncurses-detection.patch \ + "
>
> # hardcoded here for use in dialog-static recipe S =
> "${WORKDIR}/dialog-${PV}"
>
> -inherit autotools +inherit autotools-brokensep pkgconfig
>
> EXTRA_OECONF = "--with-ncurses \ --disable-rpath-hack" diff --git
> a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
> b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
>
>
new file mode 100644
> index 0000000..b5b4b3c --- /dev/null +++
> b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
>
>
@@ -0,0 +1,40 @@
> +Subject: [PATCH] use pkg-config for ncurses detection. +
> +Upstream-Status: Inappropriate [configuration]
Why is it inappropriate?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFTopKRMkyGM64RGpERApAeAKCLeZIGfWL4weiMzenWA91aQFuqqwCgoRxq
xO5IYoi3T4N5J8UU8s834Po=
=fy9z
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][meta-oe] dialog: use pkg-config to detect ncurses
2014-06-19 7:34 ` Koen Kooi
@ 2014-06-19 8:23 ` Rongqing Li
2014-06-19 8:46 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Rongqing Li @ 2014-06-19 8:23 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
On 06/19/2014 03:34 PM, Koen Kooi wrote:
>> +Subject: [PATCH] use pkg-config for ncurses detection. +
>> >+Upstream-Status: Inappropriate [configuration]
> Why is it inappropriate?
I think we should fix the configure.in, but this configure.in can not
work with oe-core, the dialog bb file runs configure directly, and
I do this fix in configure directly, so it is Inappropriate
-Roy
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][meta-oe] dialog: use pkg-config to detect ncurses
2014-06-19 8:23 ` Rongqing Li
@ 2014-06-19 8:46 ` Martin Jansa
2014-06-19 8:51 ` Rongqing Li
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2014-06-19 8:46 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]
On Thu, Jun 19, 2014 at 04:23:57PM +0800, Rongqing Li wrote:
>
>
> On 06/19/2014 03:34 PM, Koen Kooi wrote:
> >> +Subject: [PATCH] use pkg-config for ncurses detection. +
> >> >+Upstream-Status: Inappropriate [configuration]
> > Why is it inappropriate?
>
>
> I think we should fix the configure.in, but this configure.in can not
> work with oe-core, the dialog bb file runs configure directly, and
> I do this fix in configure directly, so it is Inappropriate
Can you please fix dialog-static as well? It probably doesn't even work with B!=S.
| DEBUG: Executing shell function do_configure
| gnu-configize: 'configure.ac' or 'configure.in' is required
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/dialog-static/1.1-20120706-r0/temp/log.do_configure.20677)
NOTE: recipe dialog-static-1.1-20120706-r0: task do_configure: Failed
Otherwise it will be PNBLACKLISTED this weekend (together with a lot of other unmaintained recipes)
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][meta-oe] dialog: use pkg-config to detect ncurses
2014-06-19 8:46 ` Martin Jansa
@ 2014-06-19 8:51 ` Rongqing Li
2014-06-19 9:11 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Rongqing Li @ 2014-06-19 8:51 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
On 06/19/2014 04:46 PM, Martin Jansa wrote:
> On Thu, Jun 19, 2014 at 04:23:57PM +0800, Rongqing Li wrote:
>>
>>
>> On 06/19/2014 03:34 PM, Koen Kooi wrote:
>>>> +Subject: [PATCH] use pkg-config for ncurses detection. +
>>>>> +Upstream-Status: Inappropriate [configuration]
>>> Why is it inappropriate?
>>
>>
>> I think we should fix the configure.in, but this configure.in can not
>> work with oe-core, the dialog bb file runs configure directly, and
>> I do this fix in configure directly, so it is Inappropriate
>
> Can you please fix dialog-static as well? It probably doesn't even work with B!=S.
>
Yes, I fixed it in this patch
-Roy
> | DEBUG: Executing shell function do_configure
> | gnu-configize: 'configure.ac' or 'configure.in' is required
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/dialog-static/1.1-20120706-r0/temp/log.do_configure.20677)
> NOTE: recipe dialog-static-1.1-20120706-r0: task do_configure: Failed
>
> Otherwise it will be PNBLACKLISTED this weekend (together with a lot of other unmaintained recipes)
>
>
>
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][meta-oe] dialog: use pkg-config to detect ncurses
2014-06-19 8:51 ` Rongqing Li
@ 2014-06-19 9:11 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2014-06-19 9:11 UTC (permalink / raw)
To: Rongqing Li; +Cc: Koen Kooi, openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1553 bytes --]
On Thu, Jun 19, 2014 at 04:51:38PM +0800, Rongqing Li wrote:
>
>
> On 06/19/2014 04:46 PM, Martin Jansa wrote:
> > On Thu, Jun 19, 2014 at 04:23:57PM +0800, Rongqing Li wrote:
> >>
> >>
> >> On 06/19/2014 03:34 PM, Koen Kooi wrote:
> >>>> +Subject: [PATCH] use pkg-config for ncurses detection. +
> >>>>> +Upstream-Status: Inappropriate [configuration]
> >>> Why is it inappropriate?
> >>
> >>
> >> I think we should fix the configure.in, but this configure.in can not
> >> work with oe-core, the dialog bb file runs configure directly, and
> >> I do this fix in configure directly, so it is Inappropriate
> >
> > Can you please fix dialog-static as well? It probably doesn't even work with B!=S.
> >
>
>
> Yes, I fixed it in this patch
Ah sorry, I didn't notice, can you please mention brokensep in commit
message?
> -Roy
>
> > | DEBUG: Executing shell function do_configure
> > | gnu-configize: 'configure.ac' or 'configure.in' is required
> > | WARNING: exit code 1 from a shell command.
> > | ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/dialog-static/1.1-20120706-r0/temp/log.do_configure.20677)
> > NOTE: recipe dialog-static-1.1-20120706-r0: task do_configure: Failed
> >
> > Otherwise it will be PNBLACKLISTED this weekend (together with a lot of other unmaintained recipes)
> >
> >
> >
>
> --
> Best Reagrds,
> Roy | RongQing Li
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-19 9:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-19 4:46 [PATCH][meta-oe] dialog: use pkg-config to detect ncurses rongqing.li
2014-06-19 7:34 ` Koen Kooi
2014-06-19 8:23 ` Rongqing Li
2014-06-19 8:46 ` Martin Jansa
2014-06-19 8:51 ` Rongqing Li
2014-06-19 9:11 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.