From patchwork Wed Jan 10 17:28:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 124125 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5544319qgn; Wed, 10 Jan 2018 09:29:10 -0800 (PST) X-Google-Smtp-Source: ACJfBouR9iUPihW6ZQrCeABMiCNVVZtXtKX84Ih3DY0We4dq68vTQUBU9jz9KbuWkK/20zZNsDZ6 X-Received: by 10.84.244.1 with SMTP id g1mr13824306pll.267.1515605350005; Wed, 10 Jan 2018 09:29:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515605349; cv=none; d=google.com; s=arc-20160816; b=Cy/3b7PnK+1zCg4Fjma/L38EhRl5tP3yhSnS3JID8Xp1tzYxulezlSGeXlmGzhheE+ uf97EP0Qpe+k9wwQ9z5vN4YiIIej6X0ralE1oSoM0Ek2qMGUAThiVHgcLXu8TDEN/uos 6WRqRdlBc2/dRPxoMmSedmm7MnB6mP3dk0KT7XPJV66pGFMw0Ueux+WZeMQggj14lJPN 9JQcGC0mO52WaJiw27HfjkOZNggQDfGVUcfFonWz1NnCdq08m8GJYiEHfxN1Mz5QkeXg 9R5pQmHJpK2GZt/7Uwmq1l8i6EmXA5TcWhrkUSfi/nH6dWEmHFQQb4WfGqBPrTDtIorZ /EKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=b3gDzRD11Dmkws0WykAcSiT3ULMrToNapK7RUQ+DJIE=; b=g6+1gyMzNKtgljJ2QiuizI5dWotpWR6gesBafUojVAozRcVOVksAdAyGAkfAaDKXUU S4LykP/EWOIiMhF5CSpcgOrg/aApekDdYtwgAr+tx7YJ70mlUmba7O4S34AAzRrVKvmH yRFU+uQOLYDpZvDRwOpCZGVPwZccBvYdCnsg8HMJaxwnT5J6CKgF2qBw3pwanRzc1c30 RMtQktga3DJJJiLbfPBw2ybFkODM3lSRArrB2Ta6izfwgypswgNoTjew0suokWFpbRev yW1OnPQKCk38GPYUgyf7+oEBIT5yKrhtlMqygBCSAO3rvBNtvcVN3XX53RiLNWG4nveG CsfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=WOwIbtBB; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id t64si10818664pgc.258.2018.01.10.09.29.09; Wed, 10 Jan 2018 09:29:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=WOwIbtBB; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 08FB378824; Wed, 10 Jan 2018 17:29:03 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id 4D9F278824 for ; Wed, 10 Jan 2018 17:29:01 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id i186so449305wmi.4 for ; Wed, 10 Jan 2018 09:29:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=Y6E3IA0GqW01X0WsAXvvCRoohHUStesTgMGNOwUqsAI=; b=WOwIbtBBVxJt+4gGa+WPq0sHJI8VvzyUxhHB8r4ptWgfgyxCLrI+nucbX7ziZkcX10 iKpUSYkbmCcRDzzeS8QCC2zDNtYA1i8hjtdYDHMs7RjunNHshFsY3HiAk0elZcua396W OwGtrtJhDBI/dWbnx+yglfNedqYVP0+hxH6clL9ClDpqUZUxPfrpclAY7DeU3haWVFEe 1rBP+8qvc1aDWGWMoarqiEur4WaPRQuapIA+YL49tyu8KQmBhYhgtG690tYq0A5BnkBk A573yGnKAfm9/WlQ0h0MjZm4mH+JsjBK2PWBl6A5wDGry6TVFecftD2IXht7SUYsfwUH MZ2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Y6E3IA0GqW01X0WsAXvvCRoohHUStesTgMGNOwUqsAI=; b=nfjh0vnl3MsrSYPkBfpTatK2U9EL6D2MHjJPXx4X1LxIpfR+kd1g1ouQ09SMqsY58G djxAwO24zlYvwHAvz8JqFFoyvY3GyZ+zNgI3O5AC+ZN/4bHJajFbAnNBW3QTyyfDdDxY u6gfdMrBWV1qjZtS2nBsDWHoQzOltYrNIHBWQogXU1i5CvUx7ijx+8OYC2kaS/uDUnIN gyFX92bRw47vyb4WF27DOYPUXL9hMWFd2fwlYDnjQxfTWqsTy1XqC4mPpH+xTKRLYYVM 3Pyqgsrs4Guwaj/qXDZo8rqnxbY4mr9qcqLgBrwl8ItZZN1XqU0yvqPmz8lRJ59ZfV6/ HAyA== X-Gm-Message-State: AKGB3mLBZcAilmfjYTCChAvYguQyt3gUuhD+/h7Ng8XfkJzeSwUYNvlq kpQOdcRU8JQWujhrOA600ryiPqAA X-Received: by 10.28.249.12 with SMTP id x12mr13887452wmh.122.1515605342664; Wed, 10 Jan 2018 09:29:02 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id r76sm14523561wmf.11.2018.01.10.09.29.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 09:29:01 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 10 Jan 2018 17:28:57 +0000 Message-Id: <20180110172858.22739-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] glib-2.0: rationalise build dependencies X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org nativesdk-glib-2.0 doesn't build-depend on nativesdk-gettext, but all variations need to depend on gettext-native as they need msgfmt (so gettext-minimal-native isn't an option). Also add virtual/libintl as glib explicitly needs this. Generally this is provided by glibc but some platforms (such as MinGW) don't. Signed-off-by: Ross Burton --- meta/recipes-core/glib-2.0/glib.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index cfeb48a5368..b374f6bb2e4 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -3,7 +3,7 @@ DESCRIPTION = "GLib is a general-purpose utility library, which provides many us HOMEPAGE = "https://developer.gnome.org/glib/" # pcre is under BSD; -# docs/reference/COPYING is with a 'public domai'-like license! +# docs/reference/COPYING is with a 'public domain'-like license! LICENSE = "LGPLv2.1+ & BSD & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ @@ -19,10 +19,13 @@ CVE_PRODUCT = "glib" BBCLASSEXTEND = "native nativesdk" -DEPENDS = "virtual/libiconv libffi zlib glib-2.0-native" -DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' dbus', '', d)}" -DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" -DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib glib-2.0-native" +DEPENDS = "glib-2.0-native \ + gettext-native \ + virtual/libintl \ + virtual/libiconv \ + libffi \ + zlib \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus', '', d)}" PACKAGES += "${PN}-codegen ${PN}-utils" From patchwork Wed Jan 10 17:28:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 124126 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5544573qgn; Wed, 10 Jan 2018 09:29:27 -0800 (PST) X-Google-Smtp-Source: ACJfBosZcF3iS7sJ093PmV+6Z+KmRP/umy4QYjc6ZKsypohYtMCdehz6PgGMQ2hulZ7QvGWv/Hg5 X-Received: by 10.99.191.75 with SMTP id i11mr14906486pgo.300.1515605366936; Wed, 10 Jan 2018 09:29:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515605366; cv=none; d=google.com; s=arc-20160816; b=PF3tZDYzfVaFcV5fNh06OL1uH3qGOLXIcxS3MdLtN7sIIutOB3XUYHi4pZKZEeQHgs dUqdlsos7ZES9FW2NzmSiEnvbIEN5lfOM0G4x10NkI/AMY5ca0IHkQf/cqsYj4MQXYnm 6yKi+Ga2/+12+7WRFIL5MMYM96j0X+zwiUjzoahi4NnISc5IQr1OfgEIrjDuzgDsl5Zu CsKdOh5y/9e7xTLa8Za08u2K2yv+K7HL46YW7rDnkuBOJlWkymZTR0jnkCZ2MsNMh3+q ikqiqL5c+7jbMCRTTq6O4ApACTITKUenjXeO17+L2eUSgIAfNvBmmZ9PUPeuLJQ8MWX6 rvrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=8uhaZssXFHjZnQ6MkjwjWT7N0Y7+ce4DHECNE4w47Ss=; b=qJBz6pN8yk0z8KsVQWeVvLEyLciQXg6R1aCVhuc6byniaOCV0UI+x/z6gCziZRR/uh l1bCjIsZWalc53TnjFe58W+dTLK+tsMrqhAaO7e6omSSN9mUCdXXJcNDSJxiuYwpxSar lassd0UQuaw6NgVscCsKNyuUkUUD0D8cKLM2ohy46qLmvKTgQipHAkWlDpYkA4txF9kq rJtVmDB4g0eW4vGQ1b6N5BTqjYx3VBTQkMbveQTyHHx60cDwub43V3QfK/1B4cZZj60r 2+iSReL+CxDgm27SuNNcZ/zdQmyjsUL1BrsqsiUABoN08ABLGKgADLboAJ1Zau4GTmJN SwsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=gJqzJ0P/; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l6si8040940pgc.434.2018.01.10.09.29.26; Wed, 10 Jan 2018 09:29:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=gJqzJ0P/; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 48D7F7884F; Wed, 10 Jan 2018 17:29:24 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id AF2A778820 for ; Wed, 10 Jan 2018 17:29:03 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id f140so481336wmd.2 for ; Wed, 10 Jan 2018 09:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=8wSD/bxKBpKPcmAe3USi2B5esM2OEcIxVog0enVomEQ=; b=gJqzJ0P/9hMBFkgJjq8SayZPK78LXJTlzcRvHMP1QmaVQk70PT60qQhBeBBc2o+ky9 YawErK2k1BDEB9wnCMsIlTIZarMq7ZiRe1RgTnixint0khQVJurJniYfrNaX7ZD5UsZJ Hi298M7P8LK/uZkA1tVI6wCB+ukiD7mOvgTplyORUd1SjmaJbj5DcAkK3dYjJPSIbFla q16up6KVoVUMcnOLo6vUQkaPX5PPZM8waG3Mmdr1MszimpKv3prCpe/4Bm8iwBsgyjy5 lnwT0WX2F+0c7aFAzYfvHGTTWrG11/QIXUnRBBv5r/ZvPLC1z9qqtpN93EKPELzc2tgy jIhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8wSD/bxKBpKPcmAe3USi2B5esM2OEcIxVog0enVomEQ=; b=EnahuaUlpSZjRKW4l36PLH2lxaJvqpEW6VGiWO6clcf+riwiDOFhpaMvIhgpi4brNf rcV3Tnp8epdLgF6zMtIMknoWxKzF3/t2bPLKK46RUvTOFri5lrWOdS7s3SNvqrIH0EDd nfAzBsOMAgrM9F2ZdARkrr2ejKDGwOlhyYjBTylByVtEq0gA6PE10GdcmS9P53CB5koy VaIPkWQGRivz+zKJo15aQWfTUpZxGJnLkMoChPC5sUSApLj6Xkc638gvMQjC0pke0nFw aeu6x5liMT/1fK2FA3l+NnchQTQaUUnnpWXdu0wcMVO7mEUo6uEBz1flJOsqTkEuu1r8 uZgg== X-Gm-Message-State: AKGB3mLFwh8QZH9B/tKNcizp8YqYw/20LtxJEVXEaF4nTd5NGrOrqBA0 hYnXoSmQXmxFQjDO5FVSojf1IpKy X-Received: by 10.28.146.16 with SMTP id u16mr16168311wmd.124.1515605343891; Wed, 10 Jan 2018 09:29:03 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id r76sm14523561wmf.11.2018.01.10.09.29.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 09:29:03 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 10 Jan 2018 17:28:58 +0000 Message-Id: <20180110172858.22739-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180110172858.22739-1-ross.burton@intel.com> References: <20180110172858.22739-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/2] gettext: rationalise optional dependencies X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org gettext has optional dependencies on libxml2, glib, libcroco and libunistring. If they're not available then gettext will use internal copies, but it can also use system libraries. For gettext-native and nativesdk-gettext continue to use the internal copies to reduce the dependencies, but for target use the system shared libraries. Also gettext 0.19.7 onwards swapped expat for libxm2, so remove the build dependency on expat. Signed-off-by: Ross Burton --- meta/recipes-core/gettext/gettext_0.19.8.1.bb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb index c2059e608b1..97083c0da2d 100644 --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb @@ -8,7 +8,7 @@ SECTION = "libs" LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "gettext-native virtual/libiconv expat" +DEPENDS = "gettext-native virtual/libiconv" DEPENDS_class-native = "gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" PROVIDES_class-native = "virtual/gettext-native" @@ -22,8 +22,6 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092" SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43" -PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," - inherit autotools texinfo EXTRA_OECONF += "--without-lispdir \ @@ -33,18 +31,24 @@ EXTRA_OECONF += "--without-lispdir \ --disable-native-java \ --disable-openmp \ --disable-acl \ - --with-included-glib \ --without-emacs \ --without-cvs \ --without-git \ - --with-included-libxml \ - --with-included-libcroco \ - --with-included-libunistring \ " EXTRA_OECONF_append_class-target = " \ --with-bisonlocaledir=${datadir}/locale \ " +PACKAGECONFIG ??= "croco glib libxml libunistring" +PACKAGECONFIG_class-native = "" +PACKAGECONFIG_class-nativesdk = "" + +PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco" +PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0" +PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2" +PACKAGECONFIG[libunistring] = "--without-included-libunistring,--with-included-libunistring,libunistring" +PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," + acpaths = '-I ${S}/gettext-runtime/m4 \ -I ${S}/gettext-tools/m4'