From patchwork Wed Aug 6 19:16:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 377351 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 71E751400AA for ; Thu, 7 Aug 2014 05:17:16 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 8F4F83F9B1 for ; Wed, 6 Aug 2014 21:17:14 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by hugin.dotsrc.org (Postfix) with ESMTPS id 3B5423FD8F for ; Wed, 6 Aug 2014 21:17:13 +0200 (CEST) Received: by mail-wi0-f176.google.com with SMTP id bs8so9435647wib.3 for ; Wed, 06 Aug 2014 12:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DkhdPtgBhRssLDo43BIQZdnuI0nHyY+bOu4nEevEhHY=; b=mUd9x/uDvG1XAZq02ynvHhv6BYJPup38SA90djDsSPgpgBFVvVYeq7u09JcQPTjXU4 2UgsbI31adhgwzKHg6psCyB1ROxBIYX3AiK34LSUA5/3oCvTCIMqFwZY4DrYk49Xt4nZ UQnVpjO3OQ/bGhYnXllNy6MDq60H1dYEXLZtCO8Vd1PLfz55mlK5VlX6olyoqhGwpnta u80QVRUmyvHz7PERkysF2Ee7HrNWNrDLB9tKsCNmkZMjv1sTijqCnpmlKqC0SXOCGsYZ e83tV0kjpUTIXc8CxQhLUJLu+gibuMY2Jh63Vh+k/BWbdeE9a0RP0+K4Hs+piC80EthA V/LA== X-Received: by 10.194.24.2 with SMTP id q2mr17840038wjf.91.1407352631585; Wed, 06 Aug 2014 12:17:11 -0700 (PDT) Received: from localhost.localdomain (mut38-h01-31-33-249-220.dsl.sta.abo.bbox.fr. [31.33.249.220]) by mx.google.com with ESMTPSA id ej10sm21057792wib.12.2014.08.06.12.17.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 12:17:10 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 08/20] Replace TARGET_OS by HOST_KERNEL/HOST_LIBC Date: Wed, 6 Aug 2014 21:16:39 +0200 Message-Id: <1407352611-7652-8-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1407352611-7652-1-git-send-email-diorcet.yann@gmail.com> References: <1407352611-7652-1-git-send-email-diorcet.yann@gmail.com> X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- classes/auto-package-libs.oeclass | 2 +- classes/c.oeclass | 12 ++++++++---- classes/sdk-image.oeclass | 6 +++--- conf/package.conf | 6 +++--- conf/paths.conf | 8 ++++---- recipes/readline/readline.inc | 4 ++-- recipes/readline/readline_6.2.oe | 2 +- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/classes/auto-package-libs.oeclass b/classes/auto-package-libs.oeclass index 4309f53..3f8c5fe 100644 --- a/classes/auto-package-libs.oeclass +++ b/classes/auto-package-libs.oeclass @@ -39,7 +39,7 @@ AUTO_PACKAGE_LIBS_DEPENDS ?= "" AUTO_PACKAGE_LIBS_RDEPENDS ?= "" AUTO_PACKAGE_LIBS_FILES ?= "${SOLIBS}" AUTO_PACKAGE_LIBS_DEV_FILES ?= "${SOLIBSDEV},.la,.a" -AUTO_PACKAGE_LIBS_DEV_FILES:>HOST_OS_mingw32 = ",.def,.lib" +AUTO_PACKAGE_LIBS_DEV_FILES:>HOST_LIBC_mingw = ",.def,.lib" META_EMIT_PREFIX += "package:AUTO_PACKAGE_LIBS split:AUTO_PACKAGE_LIBS" diff --git a/classes/c.oeclass b/classes/c.oeclass index 4538dce..b236d99 100644 --- a/classes/c.oeclass +++ b/classes/c.oeclass @@ -100,9 +100,11 @@ HOST_LDFLAGS_HASH_STYLE:sdk = "${SDK_HOST_LDFLAGS_HASH_STYLE}" HOST_LDFLAGS_HASH_STYLE:canadian-cross = "${SDK_HOST_LDFLAGS_HASH_STYLE}" HOST_LDFLAGS_HASH_STYLE:HOST_KERNEL_darwin = "" MACHINE_HOST_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${MACHINE_LINK_HASH_STYLE}" -MACHINE_HOST_LDFLAGS_HASH_STYLE:HOST_OS_mingw32 = "" +MACHINE_HOST_LDFLAGS_HASH_STYLE:HOST_LIBC_mingw = "" +MACHINE_HOST_LDFLAGS_HASH_STYLE:HOST_KERNEL_darwin = "" SDK_HOST_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${SDK_LINK_HASH_STYLE}" -SDK_HOST_LDFLAGS_HASH_STYLE:HOST_OS_mingw32 = "" +SDK_HOST_LDFLAGS_HASH_STYLE:HOST_LIBC_mingw = "" +SDK_HOST_LDFLAGS_HASH_STYLE:HOST_KERNEL_darwin = "" TARGET_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${BUILD_LINK_HASH_STYLE}" TARGET_LDFLAGS_HASH_STYLE:cross = "${MACHINE_TARGET_LDFLAGS_HASH_STYLE}" @@ -111,9 +113,11 @@ TARGET_LDFLAGS_HASH_STYLE:canadian-cross= "${MACHINE_TARGET_LDFLAGS_HASH_STYLE}" TARGET_LDFLAGS_HASH_STYLE:sdk = "${SDK_TARGET_LDFLAGS_HASH_STYLE}" TARGET_LDFLAGS_HASH_STYLE:sdk-cross = "${SDK_TARGET_LDFLAGS_HASH_STYLE}" MACHINE_TARGET_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${MACHINE_LINK_HASH_STYLE}" -MACHINE_TARGET_LDFLAGS_HASH_STYLE:TARGET_OS_mingw32 = "" +MACHINE_TARGET_LDFLAGS_HASH_STYLE:TARGET_LIBC_mingw = "" +MACHINE_TARGET_LDFLAGS_HASH_STYLE:TARGET_KERNEL_darwin = "" SDK_TARGET_LDFLAGS_HASH_STYLE = "-Wl,--hash-style=${SDK_LINK_HASH_STYLE}" -SDK_TARGET_LDFLAGS_HASH_STYLE:TARGET_OS_mingw32 = "" +SDK_TARGET_LDFLAGS_HASH_STYLE:TARGET_LIBC_mingw = "" +SDK_TARGET_LDFLAGS_HASH_STYLE:TARGET_KERNEL_darwin = "" inherit chrpath diff --git a/classes/sdk-image.oeclass b/classes/sdk-image.oeclass index 3f89006..f96e7fe 100644 --- a/classes/sdk-image.oeclass +++ b/classes/sdk-image.oeclass @@ -15,10 +15,10 @@ RECIPE_TYPES ?= "canadian-cross" inherit archive-image IMAGE_BASENAME ?= "oe-lite-sdk-${HOST_ARCH}-${TARGET_ARCH}" ARCHIVE_IMAGE_DIRNAME ?= "sdk" -ARCHIVE_IMAGE_FORMATS:HOST_OS_mingw32 = "zip" +ARCHIVE_IMAGE_FORMATS:HOST_LIBC_mingw = "zip" IMAGE_PREPROCESS_NETFILTER = "" -IMAGE_PREPROCESS_NETFILTER:HOST_OS_mingw32 = "image_preprocess_linux_netfilter_headers" +IMAGE_PREPROCESS_NETFILTER:HOST_LIBC_mingw = "image_preprocess_linux_netfilter_headers" IMAGE_PREPROCESS_FUNCS += "${IMAGE_PREPROCESS_NETFILTER}" inherit elfwrapper @@ -85,7 +85,7 @@ RDEPENDS_SDK += "${RDEPENDS_SDK_UBOOT_MKIMAGE}" RDEPENDS_SDK_UBOOT_MKIMAGE = "" RDEPENDS_SDK_UBOOT_MKIMAGE:USE_sdk_uboot_mkimage = "${UBOOT_MKIMAGE}" UBOOT_MKIMAGE = "host:u-boot-tools-mkimage" -UBOOT_MKIMAGE:HOST_OS_mingw32 = "" +UBOOT_MKIMAGE:HOST_LIBC_mingw = "" CLASS_FLAGS += "sdk_archive_formats sdk_archive_tar_ext" DEFAULT_USE_sdk_archive_formats = "tar" diff --git a/conf/package.conf b/conf/package.conf index d4e53d7..fa2411e 100644 --- a/conf/package.conf +++ b/conf/package.conf @@ -14,9 +14,9 @@ MAINTAINER = "OE Lite community " HOMEPAGE = "unknown" SOLIBS = ".so.*" -SOLIBS:HOST_OS_mingw32 = "-*.dll" +SOLIBS:HOST_LIBC_mingw = "-*.dll" SOLIBSDEV = ".so" -SOLIBSDEV:HOST_OS_mingw32 = ".dll.a" +SOLIBSDEV:HOST_LIBC_mingw = ".dll.a" PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-locale ${PN}" @@ -55,7 +55,7 @@ ${libdir}/pkgconfig ${FILES_DEV_MINGW} """ FILES_DEV_MINGW = "" -FILES_DEV_MINGW:HOST_OS_mingw32 = """ +FILES_DEV_MINGW:HOST_LIBC_mingw = """ ${base_libdir}/*.def ${libdir}/*.def ${base_libdir}/*.lib diff --git a/conf/paths.conf b/conf/paths.conf index f1e15cd..94df493 100644 --- a/conf/paths.conf +++ b/conf/paths.conf @@ -4,11 +4,11 @@ bootdir ?= "/boot" kernelsrcdir = "${prefix}/src/linux" base_sharedlibdir = "${base_libdir}" -base_sharedlibdir:HOST_OS_mingw32 = "${base_bindir}" +base_sharedlibdir:HOST_LIBC_mingw = "${base_bindir}" sharedlibdir = "${libdir}" -sharedlibdir:HOST_OS_mingw32 = "${bindir}" +sharedlibdir:HOST_LIBC_mingw = "${bindir}" target_base_sharedlibdir = "${target_base_libdir}" -target_base_sharedlibdir:TARGET_OS_mingw32 = "${target_base_bindir}" +target_base_sharedlibdir:TARGET_LIBC_mingw = "${target_base_bindir}" target_sharedlibdir = "${target_libdir}" -target_sharedlibdir:TARGET_OS_mingw32 = "${target_bindir}" +target_sharedlibdir:TARGET_LIBC_mingw = "${target_bindir}" diff --git a/recipes/readline/readline.inc b/recipes/readline/readline.inc index 85c6f41..945d26c 100644 --- a/recipes/readline/readline.inc +++ b/recipes/readline/readline.inc @@ -11,7 +11,7 @@ inherit auto-package-libs AUTO_PACKAGE_LIBS = "readline history" AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev" -SOLIBS:HOST_OS_mingw32 = "${@d.get('PV').split('.')[0]}.dll" +SOLIBS:HOST_LIBC_mingw = "${@d.get('PV').split('.')[0]}.dll" DEPENDS = "libtermcap" -DEPENDS:HOST_OS_mingw32 = "" +DEPENDS:HOST_LIBC_mingw = "" diff --git a/recipes/readline/readline_6.2.oe b/recipes/readline/readline_6.2.oe index e94ae2d..d413bb5 100644 --- a/recipes/readline/readline_6.2.oe +++ b/recipes/readline/readline_6.2.oe @@ -9,7 +9,7 @@ LICENSE = "GPL-3.0+" require readline.inc -SRC_URI:>TARGET_OS_darwin = " file://patch-shobj-conf.patch" +SRC_URI:>TARGET_KERNEL_darwin = " file://patch-shobj-conf.patch" # Local Variables: # mode: python