From patchwork Wed Aug 6 19:18:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 377385 X-Patchwork-Delegate: chbs@prevas.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 BCE9B1400D6 for ; Thu, 7 Aug 2014 05:19:45 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 2194E3FD8F for ; Wed, 6 Aug 2014 21:19:45 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by hugin.dotsrc.org (Postfix) with ESMTPS id 19E903F9B1 for ; Wed, 6 Aug 2014 21:19:43 +0200 (CEST) Received: by mail-we0-f172.google.com with SMTP id x48so3120062wes.17 for ; Wed, 06 Aug 2014 12:19:42 -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=M+whYaiajGHK0Cg7+z3gun87xSGOuDNyx6uD0NywtG8=; b=Cldm4BLg9FaYD325BYTTC05gQjO1wSRo7V57bU2uKWNSp4MAmwxt/3hkJZuIg7jZfe X3xxhXJSGnWOS+kEHXc1cTU+DYLS9PTatjR/gjddaBdiOEaSpF8TI0TB/AqAx7BYdj5R 2OFPkDmpiGrvYbbrzB9Vhae0kzjhzNZD8UJSmOoZMY+0tSoI+WGpGodIf/bhfxd0mjIG Zes4w0N1dgihvIIiMpukCG2pXAEp3fJ+zIV0bSJCf6VsN5F3zUMs9u6iTIofVjsdU14K VxXB+2wMa55WOP4jHs7+SE0GDBnEU2SWslfxNw2G6hXtmKOPPGNnJvg+IQ1MVI7UkE2E hT5A== X-Received: by 10.180.98.163 with SMTP id ej3mr18565698wib.36.1407352782545; Wed, 06 Aug 2014 12:19:42 -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 fb12sm4426294wjc.43.2014.08.06.12.19.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 12:19:41 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 5/8] Replace TARGET_OS by HOST_KERNEL/HOST_LIBC Date: Wed, 6 Aug 2014 21:18:54 +0200 Message-Id: <1407352737-7959-5-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1407352737-7959-1-git-send-email-diorcet.yann@gmail.com> References: <1407352737-7959-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 --- recipes/ffmpeg/ffmpeg.inc | 14 +++++++------- recipes/ffmpeg/ffmpeg_0.10.2.oe | 4 ++-- recipes/libvpx/libvpx.inc | 2 +- recipes/libvpx/libvpx_1.3.0.oe | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc index bd03154..8a811f6 100644 --- a/recipes/ffmpeg/ffmpeg.inc +++ b/recipes/ffmpeg/ffmpeg.inc @@ -66,19 +66,19 @@ AUTO_PACKAGE_LIBS_PCPREFIX = "lib" AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}" FILES_${PN}-libavfilter += "${sharedlibdir}/avfilter${SOLIBS}" -FILES_${PN}-libavfilter-dev:TARGET_OS_mingw32 += "${libdir}/avfilter*.def ${libdir}/avfilter*.lib" +FILES_${PN}-libavfilter-dev:HOST_LIBC_mingw += "${libdir}/avfilter*.def ${libdir}/avfilter*.lib" FILES_${PN}-libavdevice += "${sharedlibdir}/avdevice${SOLIBS}" -FILES_${PN}-libavdevice-dev:TARGET_OS_mingw32 += "${libdir}/avdevice*.def ${libdir}/avdevice*.lib" +FILES_${PN}-libavdevice-dev:HOST_LIBC_mingw += "${libdir}/avdevice*.def ${libdir}/avdevice*.lib" FILES_${PN}-libavformat += "${sharedlibdir}/avformat${SOLIBS}" -FILES_${PN}-libavformat-dev:TARGET_OS_mingw32 += "${libdir}/avformat*.def ${libdir}/avformat*.lib" +FILES_${PN}-libavformat-dev:HOST_LIBC_mingw += "${libdir}/avformat*.def ${libdir}/avformat*.lib" FILES_${PN}-libavcodec += "${sharedlibdir}/avcodec${SOLIBS}" -FILES_${PN}-libavcodec-dev:TARGET_OS_mingw32 += "${libdir}/avcodec*.def ${libdir}/avcodec*.lib" +FILES_${PN}-libavcodec-dev:HOST_LIBC_mingw += "${libdir}/avcodec*.def ${libdir}/avcodec*.lib" DEPENDS_${PN}-libavcodec += " ${PN}-libavutil ${PN}-libswscale" RDEPENDS_${PN}-libavcodec += " ${DEPENDS} ${PN}-libavutil ${PN}-libswscale" FILES_${PN}-libavutil += "${sharedlibdir}/avutil${SOLIBS}" -FILES_${PN}-libavutil-dev:TARGET_OS_mingw32 += "${libdir}/avutil*.def ${libdir}/avutil*.lib" +FILES_${PN}-libavutil-dev:HOST_LIBC_mingw += "${libdir}/avutil*.def ${libdir}/avutil*.lib" FILES_${PN}-libswscale += "${sharedlibdir}/swscale${SOLIBS}" -FILES_${PN}-libswscale-dev:TARGET_OS_mingw32 += "${libdir}/swscale*.def ${libdir}/swscale*.lib" +FILES_${PN}-libswscale-dev:HOST_LIBC_mingw += "${libdir}/swscale*.def ${libdir}/swscale*.lib" FILES_${PN}-libswresample += "${sharedlibdir}/swresample${SOLIBS}" -FILES_${PN}-libswresample-dev:TARGET_OS_mingw32 += "${libdir}/swresample*.def ${libdir}/swresample*.lib" +FILES_${PN}-libswresample-dev:HOST_LIBC_mingw += "${libdir}/swresample*.def ${libdir}/swresample*.lib" FILES_${PN}-util += "${bindir}/ffmpeg* ${bindir}/ffprobe* /usr/share/ffmpeg/*" diff --git a/recipes/ffmpeg/ffmpeg_0.10.2.oe b/recipes/ffmpeg/ffmpeg_0.10.2.oe index b5337cb..34fadae 100644 --- a/recipes/ffmpeg/ffmpeg_0.10.2.oe +++ b/recipes/ffmpeg/ffmpeg_0.10.2.oe @@ -3,5 +3,5 @@ require ffmpeg.inc SRC_URI += "file://disable-sdl.patch" SRC_URI += "file://dx.patch" SRC_URI += "file://return.patch" -SRC_URI:>TARGET_OS_mingw32 = " file://mingw.patch" -SRC_URI:>TARGET_OS_darwin = " file://patch-configure-osx.patch" +SRC_URI:>HOST_LIBC_mingw = " file://mingw.patch" +SRC_URI:>HOST_KERNEL_darwin = " file://patch-configure-osx.patch" diff --git a/recipes/libvpx/libvpx.inc b/recipes/libvpx/libvpx.inc index 6d9f3e8..1802cb2 100644 --- a/recipes/libvpx/libvpx.inc +++ b/recipes/libvpx/libvpx.inc @@ -4,7 +4,7 @@ LICENSE = "BSD" RECIPE_TYPES = "machine native" DEPENDS = "libm" -DEPENDS:>TARGET_OS_linux-gnu = " libpthread" +DEPENDS:>HOST_KERNEL_linux = " libpthread" PARALLEL_MAKE = "" diff --git a/recipes/libvpx/libvpx_1.3.0.oe b/recipes/libvpx/libvpx_1.3.0.oe index 57d5dc9..dbbe2d9 100644 --- a/recipes/libvpx/libvpx_1.3.0.oe +++ b/recipes/libvpx/libvpx_1.3.0.oe @@ -1,5 +1,5 @@ require libvpx.inc SRC_URI += "file://enable_shared.patch" -SRC_URI:>TARGET_OS_darwin = " file://02_osx.patch" -SRC_URI:>TARGET_OS_mingw32 = " file://0001-enable-shared-on.mingw32.patch" +SRC_URI:>HOST_KERNEL_darwin = " file://02_osx.patch" +SRC_URI:>HOST_LIBC_mingw = " file://0001-enable-shared-on.mingw32.patch"