* [PATCH 0/1] ncurses: refactor configure to avoid configuring widec when disabled
@ 2011-11-08 19:08 Darren Hart
2011-11-08 19:08 ` [PATCH 1/1] " Darren Hart
2011-11-10 17:25 ` [PATCH 0/1] " Saul Wold
0 siblings, 2 replies; 5+ messages in thread
From: Darren Hart @ 2011-11-08 19:08 UTC (permalink / raw)
To: openembedded-core, tom_rini
The following changes since commit e5226b1e44052b2fe5370f4922397a1d68985aaf:
clutter-1.8: add bbappend for new clutter-1.8 recipe (2011-11-08 17:53:18 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dvhart/tiny
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/tiny
Darren Hart (1):
ncurses: refactor configure to avoid configuring widec when disabled
meta/recipes-core/ncurses/ncurses.inc | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
--
1.7.6.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] ncurses: refactor configure to avoid configuring widec when disabled
2011-11-08 19:08 [PATCH 0/1] ncurses: refactor configure to avoid configuring widec when disabled Darren Hart
@ 2011-11-08 19:08 ` Darren Hart
2011-11-09 8:33 ` Saul Wold
2011-11-10 17:25 ` [PATCH 0/1] " Saul Wold
1 sibling, 1 reply; 5+ messages in thread
From: Darren Hart @ 2011-11-08 19:08 UTC (permalink / raw)
To: openembedded-core, tom_rini
The ENABLE_WIDEC variable can be used to disable ncurses wide character support
when your C library doesn't support it. Currently, the do_configure step
configures for both narrow and wide characters regardless and only checks
ENABLE_WIDEC during compilation. This leads to QA failures with host
contamination during configure if the C library doesn't support wide characters.
Refactor do_configure with a new ncurses_configure helper function and only
configure for wide character support if ENABLE_WIDEC is true.
Ensure that configure errors are propogated back through to do_configure.
Tested with ENABLE_WIDEC as true and false via an ncurses bbappend on i586,
including basic error injection.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta/recipes-core/ncurses/ncurses.inc | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index be7d387..d3a9b1c 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -26,6 +26,36 @@ ENABLE_WIDEC = "true"
# builds.
BUILD_CPPFLAGS += "-D_GNU_SOURCE"
+# Helper function for do_configure to allow multiple configurations
+# $1 the directory to run configure in
+# $@ the arguments to pass to configure
+ncurses_configure() {
+ mkdir -p $1
+ cd $1
+ shift
+ oe_runconf \
+ --disable-static \
+ --without-debug \
+ --without-ada \
+ --without-gpm \
+ --enable-hard-tabs \
+ --enable-xmc-glitch \
+ --enable-colorfgbg \
+ --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \
+ --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \
+ --with-shared \
+ --disable-big-core \
+ --program-prefix= \
+ --with-ticlib \
+ --with-termlib=tinfo \
+ --enable-sigwinch \
+ --enable-pc-files \
+ --disable-rpath-hack \
+ --with-manpage-format=normal \
+ "$@" || return 1
+ cd ..
+}
+
# Override the function from the autotools class; ncurses requires a
# patched autoconf213 to generate the configure script. This autoconf
# is not available so that the shipped script will be used.
@@ -35,36 +65,10 @@ do_configure() {
# not the case for /dev/null redirections)
export cf_cv_working_poll=yes
- for i in \
- 'narrowc' \
- 'widec --enable-widec --without-progs'; do
- set -- $i
- mkdir -p $1
- cd $1
- shift
-
- oe_runconf \
- --disable-static \
- --without-debug \
- --without-ada \
- --without-gpm \
- --enable-hard-tabs \
- --enable-xmc-glitch \
- --enable-colorfgbg \
- --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \
- --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \
- --with-shared \
- --disable-big-core \
- --program-prefix= \
- --with-ticlib \
- --with-termlib=tinfo \
- --enable-sigwinch \
- --enable-pc-files \
- --disable-rpath-hack \
- --with-manpage-format=normal \
- "$@"
- cd ..
- done
+ ncurses_configure "narrowc" || \
+ return 1
+ ! ${ENABLE_WIDEC} || \
+ ncurses_configure "widec" "--enable-widec" "--without-progs"
}
do_compile() {
--
1.7.6.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/1] ncurses: refactor configure to avoid configuring widec when disabled
2011-11-08 19:08 ` [PATCH 1/1] " Darren Hart
@ 2011-11-09 8:33 ` Saul Wold
2011-11-09 14:40 ` Darren Hart
0 siblings, 1 reply; 5+ messages in thread
From: Saul Wold @ 2011-11-09 8:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Darren Hart, tom_rini
On 11/08/2011 11:08 AM, Darren Hart wrote:
> The ENABLE_WIDEC variable can be used to disable ncurses wide character support
> when your C library doesn't support it. Currently, the do_configure step
> configures for both narrow and wide characters regardless and only checks
> ENABLE_WIDEC during compilation. This leads to QA failures with host
> contamination during configure if the C library doesn't support wide characters.
>
> Refactor do_configure with a new ncurses_configure helper function and only
> configure for wide character support if ENABLE_WIDEC is true.
>
> Ensure that configure errors are propogated back through to do_configure.
>
> Tested with ENABLE_WIDEC as true and false via an ncurses bbappend on i586,
> including basic error injection.
>
> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
> ---
> meta/recipes-core/ncurses/ncurses.inc | 64 +++++++++++++++++---------------
> 1 files changed, 34 insertions(+), 30 deletions(-)
>
> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
> index be7d387..d3a9b1c 100644
> --- a/meta/recipes-core/ncurses/ncurses.inc
> +++ b/meta/recipes-core/ncurses/ncurses.inc
> @@ -26,6 +26,36 @@ ENABLE_WIDEC = "true"
> # builds.
> BUILD_CPPFLAGS += "-D_GNU_SOURCE"
>
No PR Bump!
Sau!
> +# Helper function for do_configure to allow multiple configurations
> +# $1 the directory to run configure in
> +# $@ the arguments to pass to configure
> +ncurses_configure() {
> + mkdir -p $1
> + cd $1
> + shift
> + oe_runconf \
> + --disable-static \
> + --without-debug \
> + --without-ada \
> + --without-gpm \
> + --enable-hard-tabs \
> + --enable-xmc-glitch \
> + --enable-colorfgbg \
> + --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \
> + --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \
> + --with-shared \
> + --disable-big-core \
> + --program-prefix= \
> + --with-ticlib \
> + --with-termlib=tinfo \
> + --enable-sigwinch \
> + --enable-pc-files \
> + --disable-rpath-hack \
> + --with-manpage-format=normal \
> + "$@" || return 1
> + cd ..
> +}
> +
> # Override the function from the autotools class; ncurses requires a
> # patched autoconf213 to generate the configure script. This autoconf
> # is not available so that the shipped script will be used.
> @@ -35,36 +65,10 @@ do_configure() {
> # not the case for /dev/null redirections)
> export cf_cv_working_poll=yes
>
> - for i in \
> - 'narrowc' \
> - 'widec --enable-widec --without-progs'; do
> - set -- $i
> - mkdir -p $1
> - cd $1
> - shift
> -
> - oe_runconf \
> - --disable-static \
> - --without-debug \
> - --without-ada \
> - --without-gpm \
> - --enable-hard-tabs \
> - --enable-xmc-glitch \
> - --enable-colorfgbg \
> - --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \
> - --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \
> - --with-shared \
> - --disable-big-core \
> - --program-prefix= \
> - --with-ticlib \
> - --with-termlib=tinfo \
> - --enable-sigwinch \
> - --enable-pc-files \
> - --disable-rpath-hack \
> - --with-manpage-format=normal \
> - "$@"
> - cd ..
> - done
> + ncurses_configure "narrowc" || \
> + return 1
> + ! ${ENABLE_WIDEC} || \
> + ncurses_configure "widec" "--enable-widec" "--without-progs"
> }
>
> do_compile() {
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/1] ncurses: refactor configure to avoid configuring widec when disabled
2011-11-09 8:33 ` Saul Wold
@ 2011-11-09 14:40 ` Darren Hart
0 siblings, 0 replies; 5+ messages in thread
From: Darren Hart @ 2011-11-09 14:40 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On 11/09/2011 12:33 AM, Saul Wold wrote:
> On 11/08/2011 11:08 AM, Darren Hart wrote:
>> The ENABLE_WIDEC variable can be used to disable ncurses wide character support
>> when your C library doesn't support it. Currently, the do_configure step
>> configures for both narrow and wide characters regardless and only checks
>> ENABLE_WIDEC during compilation. This leads to QA failures with host
>> contamination during configure if the C library doesn't support wide characters.
>>
>> Refactor do_configure with a new ncurses_configure helper function and only
>> configure for wide character support if ENABLE_WIDEC is true.
>>
>> Ensure that configure errors are propogated back through to do_configure.
>>
>> Tested with ENABLE_WIDEC as true and false via an ncurses bbappend on i586,
>> including basic error injection.
>>
>> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
>> ---
>> meta/recipes-core/ncurses/ncurses.inc | 64 +++++++++++++++++---------------
>> 1 files changed, 34 insertions(+), 30 deletions(-)
>>
>> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
>> index be7d387..d3a9b1c 100644
>> --- a/meta/recipes-core/ncurses/ncurses.inc
>> +++ b/meta/recipes-core/ncurses/ncurses.inc
>> @@ -26,6 +26,36 @@ ENABLE_WIDEC = "true"
>> # builds.
>> BUILD_CPPFLAGS += "-D_GNU_SOURCE"
>>
> No PR Bump!
Right, duh. Thanks for catching. I've pushed to the same location having
added:
-INC_PR = "r1"
+INC_PR = "r2"
http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=dvhart/tiny&id=170541c552017ca784f395a9b52aae6b7c9f3592
Thanks,
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] ncurses: refactor configure to avoid configuring widec when disabled
2011-11-08 19:08 [PATCH 0/1] ncurses: refactor configure to avoid configuring widec when disabled Darren Hart
2011-11-08 19:08 ` [PATCH 1/1] " Darren Hart
@ 2011-11-10 17:25 ` Saul Wold
1 sibling, 0 replies; 5+ messages in thread
From: Saul Wold @ 2011-11-10 17:25 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Darren Hart, tom_rini
On 11/08/2011 11:08 AM, Darren Hart wrote:
> The following changes since commit e5226b1e44052b2fe5370f4922397a1d68985aaf:
>
> clutter-1.8: add bbappend for new clutter-1.8 recipe (2011-11-08 17:53:18 +0000)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib dvhart/tiny
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/tiny
>
> Darren Hart (1):
> ncurses: refactor configure to avoid configuring widec when disabled
>
> meta/recipes-core/ncurses/ncurses.inc | 64 +++++++++++++++++---------------
> 1 files changed, 34 insertions(+), 30 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-10 17:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-08 19:08 [PATCH 0/1] ncurses: refactor configure to avoid configuring widec when disabled Darren Hart
2011-11-08 19:08 ` [PATCH 1/1] " Darren Hart
2011-11-09 8:33 ` Saul Wold
2011-11-09 14:40 ` Darren Hart
2011-11-10 17:25 ` [PATCH 0/1] " Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox