Patchwork [1/1] ncurses: refactor configure to avoid configuring widec when disabled

login
register
mail settings
Submitter Darren Hart
Date Nov. 8, 2011, 7:08 p.m.
Message ID <6e5f3af0ae4f9f99f27bf2c909eef951599ff381.1320779076.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/14533/
State New
Headers show

Comments

Darren Hart - Nov. 8, 2011, 7:08 p.m.
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(-)
Saul Wold - Nov. 9, 2011, 8:33 a.m.
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() {
Darren Hart - Nov. 9, 2011, 2:40 p.m.
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,

Patch

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() {