From 937d0699f77a83bb4e98ea5b3dde3c27e43ac060 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Wed, 19 Aug 2015 17:27:23 +0800 Subject: dialog: upgrade to 1.2-20150528 remove use-pkg-config-for-ncurses-detection.patch, the new version is using the pkg-config to check ncurses configuration assumes the cf_have_ncuconfig is unknown for cross-compile, but ncurses is added into DEPENDS, so change it as yes Signed-off-by: Roy Li Signed-off-by: Martin Jansa --- .../recipes-extended/dialog/dialog_1.2-20150225.bb | 30 -------------------- .../recipes-extended/dialog/dialog_1.2-20150528.bb | 30 ++++++++++++++++++++ .../use-pkg-config-for-ncurses-detection.patch | 32 ---------------------- 3 files changed, 30 insertions(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb create mode 100644 meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb delete mode 100644 meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch (limited to 'meta-oe/recipes-extended/dialog') diff --git a/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb b/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb deleted file mode 100644 index 88af59f11a..0000000000 --- a/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "display dialog boxes from shell scripts" -DESCRIPTION = "Dialog lets you to present a variety of questions \ -or display messages using dialog boxes from a shell \ -script (or any scripting language)." -HOMEPAGE = "http://invisible-island.net/dialog/" -SECTION = "console/utils" -DEPENDS = "ncurses" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "38ef59a7daa5459119cb06777c735e4b" -SRC_URI[sha256sum] = "6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff" - -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-brokensep pkgconfig - -EXTRA_OECONF = "--with-ncurses \ - --disable-rpath-hack" - -do_configure() { - gnu-configize --force - sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure - oe_runconf -} diff --git a/meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb b/meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb new file mode 100644 index 0000000000..4fb938e7ac --- /dev/null +++ b/meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb @@ -0,0 +1,30 @@ +SUMMARY = "display dialog boxes from shell scripts" +DESCRIPTION = "Dialog lets you to present a variety of questions \ +or display messages using dialog boxes from a shell \ +script (or any scripting language)." +HOMEPAGE = "http://invisible-island.net/dialog/" +SECTION = "console/utils" +DEPENDS = "ncurses" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[md5sum] = "593615fb448e001e5b81420473a7354b" +SRC_URI[sha256sum] = "a8cd7a66bdb41e53a3145cbb0eb370c5ce7300fe0e9ad6d3e8d3b9e16ff16418" + +SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ + " + +# hardcoded here for use in dialog-static recipe +S = "${WORKDIR}/dialog-${PV}" + +inherit autotools-brokensep pkgconfig + +EXTRA_OECONF = "--with-ncurses \ + --disable-rpath-hack" + +do_configure() { + gnu-configize --force + sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure + sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure + oe_runconf +} 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 deleted file mode 100644 index 0a25a7fcce..0000000000 --- a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 ---- - 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 --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 - -- cgit 1.2.3-korg