[oe] [PATCH][meta-oe] dialog: upgrade to 1.2-20150225
Martin Jansa
martin.jansa at gmail.com
Tue May 5 13:42:49 UTC 2015
On Tue, Apr 28, 2015 at 11:27:15AM +0800, rongqing.li at windriver.com wrote:
> From: Roy Li <rongqing.li at windriver.com>
>
> 1. upgrade it to 1.2-20150225
> 2. update the use-pkg-config-for-ncurses-detection.patch, use it only for
> dialog
> 3. dialog-static uses use-pkg-config-for-static-ncurses-detection.patch
> which outputs libraries suitable for static linking
Any idea why normal dialog now builds static library and tries to stage
it and fails?
ERROR: The recipe dialog is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/lib/libdialog.a
Matched in manifest-qemuarm-dialog-static.populate_sysroot
>
> The difference between with --static and without --static is below:
> $pkg-config --libs "ncurse"
> -L${SYSROOT}/usr/lib64 -lncurses
> $pkg-config --static --libs "ncurse"
> -L${SYSROOT}/usr/lib64 -lncurses -ltinfo
> $
>
> Signed-off-by: Roy Li <rongqing.li at windriver.com>
> ---
> .../dialog/dialog-static_1.1-20120706.bb | 6 ----
> .../dialog/dialog-static_1.2-20150225.bb | 6 ++++
> meta-oe/recipes-extended/dialog/dialog.inc | 1 -
> .../recipes-extended/dialog/dialog_1.1-20120706.bb | 4 ---
> .../recipes-extended/dialog/dialog_1.2-20150225.bb | 6 ++++
> .../use-pkg-config-for-ncurses-detection.patch | 28 +++++++------------
> ...e-pkg-config-for-static-ncurses-detection.patch | 32 ++++++++++++++++++++++
> 7 files changed, 54 insertions(+), 29 deletions(-)
> delete mode 100644 meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb
> create mode 100644 meta-oe/recipes-extended/dialog/dialog-static_1.2-20150225.bb
> delete mode 100644 meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb
> create mode 100644 meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
> create mode 100644 meta-oe/recipes-extended/dialog/files/use-pkg-config-for-static-ncurses-detection.patch
>
> diff --git a/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb
> deleted file mode 100644
> index 595f323..0000000
> --- a/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -require dialog.inc
> -
> -LDFLAGS += "-static"
> -
> -SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d"
> -SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5"
> diff --git a/meta-oe/recipes-extended/dialog/dialog-static_1.2-20150225.bb b/meta-oe/recipes-extended/dialog/dialog-static_1.2-20150225.bb
> new file mode 100644
> index 0000000..77d8841
> --- /dev/null
> +++ b/meta-oe/recipes-extended/dialog/dialog-static_1.2-20150225.bb
> @@ -0,0 +1,6 @@
> +require dialog.inc
> +
> +LDFLAGS += "-static"
> +SRC_URI +="file://use-pkg-config-for-static-ncurses-detection.patch"
> +SRC_URI[md5sum] = "38ef59a7daa5459119cb06777c735e4b"
> +SRC_URI[sha256sum] = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff"
> diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog.inc
> index 995d6c0..1a6e8c5 100644
> --- a/meta-oe/recipes-extended/dialog/dialog.inc
> +++ b/meta-oe/recipes-extended/dialog/dialog.inc
> @@ -9,7 +9,6 @@ LICENSE = "LGPL-2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
>
> SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \
> - file://use-pkg-config-for-ncurses-detection.patch \
Why not keep it here and only add --static parameter to pkg-config call in followup patch applied only in dialog-static?
> "
>
> # hardcoded here for use in dialog-static recipe
> diff --git a/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb
> deleted file mode 100644
> index c87fb61..0000000
> --- a/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -require dialog.inc
> -
> -SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d"
> -SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5"
> diff --git a/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb b/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
> new file mode 100644
> index 0000000..477be73
> --- /dev/null
> +++ b/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
> @@ -0,0 +1,6 @@
> +require dialog.inc
> +
> +SRC_URI +="file://use-pkg-config-for-ncurses-detection.patch"
> +
> +SRC_URI[md5sum] = "38ef59a7daa5459119cb06777c735e4b"
> +SRC_URI[sha256sum] = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff"
> 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
> index a2354ad..0a25a7f 100644
> --- 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
> @@ -8,33 +8,25 @@ file, and autoconf can not work, make a workaround in configure file.
>
> Signed-off-by: Roy Li <rongqing.li at windriver.com>
> ---
> - configure | 6 +++---
> - 1 file changed, 3 insertions(+), 3 deletions(-)
> + configure | 5 ++---
> + 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> -index 24e28c1..c78735d 100755
> +index 8afe3d7..a54bcc1 100755
> --- a/configure
> +++ b/configure
> -@@ -9976,8 +9976,8 @@ fi
> +@@ -11567,9 +11567,8 @@ fi
>
> if test "$NCURSES_CONFIG" != none ; then
>
> -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
> --LIBS="`$NCURSES_CONFIG --libs` $LIBS"
> +-
> +-cf_add_libs="`$NCURSES_CONFIG --libs`"
> +CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`"
> -+LIBS="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $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
> -
> ++cf_add_libs="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $LIBS"
> + # Filter out duplicates - this happens with badly-designed ".pc" files...
> + for cf_add_1lib in $LIBS
> + do
> --
> 1.7.10.4
>
> diff --git a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-static-ncurses-detection.patch b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-static-ncurses-detection.patch
> new file mode 100644
> index 0000000..3ed174c
> --- /dev/null
> +++ b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-static-ncurses-detection.patch
> @@ -0,0 +1,32 @@
> +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 at windriver.com>
> +---
> + configure | 5 ++---
> + 1 file changed, 2 insertions(+), 3 deletions(-)
> +
> +diff --git a/configure b/configure
> +index 8afe3d7..a54bcc1 100755
> +--- a/configure
> ++++ b/configure
> +@@ -11567,9 +11567,8 @@ fi
> +
> + if test "$NCURSES_CONFIG" != none ; then
> +
> +-CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
> +-
> +-cf_add_libs="`$NCURSES_CONFIG --libs`"
> ++CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`"
> ++cf_add_libs="`pkg-config --short-errors --print-errors --static --libs "ncurses" 2>/dev/null` $LIBS"
> + # Filter out duplicates - this happens with badly-designed ".pc" files...
> + for cf_add_1lib in $LIBS
> + do
> +--
> +1.7.10.4
> +
> --
> 2.1.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
More information about the Openembedded-devel
mailing list