From 54e9b29e8c07410674086d287400ffcf3b0eb88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 7 Apr 2016 01:00:10 +0200 Subject: [PATCH] kjs(-native): move kdoctools dependency to common kjs.inc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-kde/kf5/porting-aids-tier1/kjs/kjs-native.bb | 5 +---- recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb | 2 +- recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc | 4 ++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs-native.bb b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs-native.bb index f38d5702..df07b335 100644 --- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs-native.bb +++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs-native.bb @@ -6,7 +6,4 @@ SRC_URI += " \ file://0002-native-build-and-install-icemaker-only.patch \ " -DEPENDS += " \ - libpcre-native \ - kdoctools \ -" +DEPENDS += "libpcre-native" diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb index bc94d610..aa822fc4 100644 --- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb +++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb @@ -2,7 +2,7 @@ require ${BPN}.inc inherit cmake-lib -DEPENDS += "${BPN}-native libpcre kdoctools" +DEPENDS += "${BPN}-native libpcre" # cross libs / headers CMAKE_ALIGN_SYSROOT[1] = "KF5JS, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc index 5c5a53e3..3232581e 100644 --- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc +++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc @@ -8,3 +8,7 @@ PV = "${KF5_VERSION}" SRC_URI[md5sum] = "fbba353023ee472a93c7335d26d681dd" SRC_URI[sha256sum] = "0d2f39d4ef2f9c3f4b9a42b1adfb70e25fc912cb535a9798dc9aa49ad0cac4a1" SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch" + +DEPENDS += " \ + kdoctools \ +"