* [PATCH 2/4] kmod: inherit pkgconfig
2016-09-08 15:46 [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON Maxin B. John
@ 2016-09-08 15:46 ` Maxin B. John
2016-09-08 15:46 ` [PATCH 3/4] kconfig-frontends: " Maxin B. John
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Maxin B. John @ 2016-09-08 15:46 UTC (permalink / raw)
To: openembedded-core
Instead of DEPENDS += "pkgconfig-native", inherit pkgconfig class which does
the same.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/recipes-kernel/kmod/kmod.inc | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 99c4a8f..eeacb9a 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -9,12 +9,10 @@ LICENSE = "GPL-2.0+ & LGPL-2.1+"
LICENSE_libkmod = "LGPL-2.1+"
SECTION = "base"
-DEPENDS += "pkgconfig-native"
-
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
"
-inherit autotools gtk-doc
+inherit autotools gtk-doc pkgconfig
SRCREV = "65a885df5f6f15222b44fd695c5eaca17e837a14"
# Lookout for PV bump too when SRCREV is changed
--
2.4.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] kconfig-frontends: inherit pkgconfig
2016-09-08 15:46 [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON Maxin B. John
2016-09-08 15:46 ` [PATCH 2/4] kmod: inherit pkgconfig Maxin B. John
@ 2016-09-08 15:46 ` Maxin B. John
2016-09-08 15:46 ` [PATCH 4/4] libical: fix build failure after changing machine Maxin B. John
2016-09-08 16:04 ` [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON Burton, Ross
3 siblings, 0 replies; 6+ messages in thread
From: Maxin B. John @ 2016-09-08 15:46 UTC (permalink / raw)
To: openembedded-core
Instead of build depending on pkgconfig-native, inherit pkgconfig
class which does the same thing.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
index 48a2f93..804186d 100644
--- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
+++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
@@ -11,14 +11,14 @@ HOMEPAGE = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
SECTION = "devel"
-DEPENDS += "ncurses flex bison gperf-native pkgconfig-native"
+DEPENDS += "ncurses flex bison gperf-native"
RDEPENDS_${PN} += "python bash"
SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BP}.tar.xz"
SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2"
SRC_URI[sha256sum] = "ea2615a62c74bea6ce3b38402f00c7513858f307f6ba7aa9fdbf0bbc12bcf407"
-inherit autotools
+inherit autotools pkgconfig
do_configure_prepend () {
mkdir -p scripts/.autostuff/m4
}
--
2.4.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] libical: fix build failure after changing machine
2016-09-08 15:46 [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON Maxin B. John
2016-09-08 15:46 ` [PATCH 2/4] kmod: inherit pkgconfig Maxin B. John
2016-09-08 15:46 ` [PATCH 3/4] kconfig-frontends: " Maxin B. John
@ 2016-09-08 15:46 ` Maxin B. John
2016-09-08 16:04 ` [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON Burton, Ross
3 siblings, 0 replies; 6+ messages in thread
From: Maxin B. John @ 2016-09-08 15:46 UTC (permalink / raw)
To: openembedded-core
libical build QA fails when libical is built for e.g. qemux86-64 already, and
is then built for generic86-64 in a way that install is re-run:
$ MACHINE=qemux86-64 bitbake libical
$ MACHINE=genericx86-64 bitbake -f -Cinstall libical
ERROR: libical-2.0.0-r0 do_populate_sysroot: QA Issue: libical.pc failed
sanity test (tmpdir) in path
[YOCTO #10223]
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
...txt-libical.pc.in-fix-iculibs-remove-full.patch | 44 ++++++++++++++++++++++
meta/recipes-support/libical/libical_2.0.0.bb | 10 +----
2 files changed, 46 insertions(+), 8 deletions(-)
create mode 100644 meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
diff --git a/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch b/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
new file mode 100644
index 0000000..6db75f5
--- /dev/null
+++ b/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
@@ -0,0 +1,44 @@
+From 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter@kdab.com>
+Date: Sat, 3 Sep 2016 16:56:29 -0400
+Subject: [PATCH] CMakeLists.txt, libical.pc.in - fix iculibs (remove full path) ISSUE: 227
+
+Upstream-Status: Backport
+
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+----
+diff -Naur libical-2.0.0-orig/CMakeLists.txt libical-2.0.0/CMakeLists.txt
+--- libical-2.0.0-orig/CMakeLists.txt 2016-09-08 18:05:06.166049345 +0300
++++ libical-2.0.0/CMakeLists.txt 2016-09-08 18:05:45.201561334 +0300
+@@ -128,6 +128,7 @@
+ # RSCALE info at http://tools.ietf.org/html/rfc7529
+ find_package(ICU)
+ if(ICU_FOUND)
++ set(ICUUC_LIBS "-licuuc") #for libical.pc
+ set(HAVE_LIBICU 1)
+ if(ICU_MAJOR_VERSION VERSION_GREATER 50)
+ set(HAVE_ICU_DANGI TRUE)
+@@ -137,6 +138,7 @@
+ endif()
+ if(ICU_I18N_FOUND)
+ set(HAVE_LIBICU_I18N 1)
++ set(ICUI18N_LIBS "-licui18n") #for libical.pc
+ endif()
+
+ # MSVC specific definitions
+diff -Naur libical-2.0.0-orig/libical.pc.in libical-2.0.0/libical.pc.in
+--- libical-2.0.0-orig/libical.pc.in 2015-12-28 23:44:53.000000000 +0200
++++ libical-2.0.0/libical.pc.in 2016-09-08 18:09:12.991963597 +0300
+@@ -3,10 +3,10 @@
+ libdir=@libdir@
+ includedir=@includedir@
+ threadslib=@PTHREAD_LIBS@
+-iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
++iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@
+
+ Name: libical
+ Description: An implementation of basic iCAL protocols
+ Version: @VERSION@
+-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
++Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs}
+ Cflags: -I${includedir}
diff --git a/meta/recipes-support/libical/libical_2.0.0.bb b/meta/recipes-support/libical/libical_2.0.0.bb
index 1042e6f..d4fe868 100644
--- a/meta/recipes-support/libical/libical_2.0.0.bb
+++ b/meta/recipes-support/libical/libical_2.0.0.bb
@@ -8,6 +8,7 @@ SECTION = "libs"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
file://Remove-cmake-check-for-Perl.patch \
+ file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \
"
DEPENDS = "icu"
@@ -15,13 +16,6 @@ SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e"
SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da"
UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
-inherit cmake
+inherit cmake pkgconfig
FILES_${PN}-dev += "${libdir}/cmake/*"
-
-#
-# Turn specific library paths in the pkgconfig file into standard library entries
-#
-do_install_append () {
- sed -i -e "s#${STAGING_LIBDIR}/lib\([a-z0-9]*\)\.so#-l\1#g" ${D}${libdir}/pkgconfig/libical.pc
-}
--
2.4.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON
2016-09-08 15:46 [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON Maxin B. John
` (2 preceding siblings ...)
2016-09-08 15:46 ` [PATCH 4/4] libical: fix build failure after changing machine Maxin B. John
@ 2016-09-08 16:04 ` Burton, Ross
2016-09-09 7:42 ` Maxin B. John
3 siblings, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2016-09-08 16:04 UTC (permalink / raw)
To: Maxin B. John; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
On 8 September 2016 at 16:46, Maxin B. John <maxin.john@intel.com> wrote:
> +RECIPE_NO_UPDATE_REASON = "Version 1.9.2 requires gstreamer-1.0 >= 1.9.2"
>
Are they adopting the GStreamer versioning style, so we should inherit
upstream-version-is-even instead?
Ross
[-- Attachment #2: Type: text/html, Size: 682 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON
2016-09-08 16:04 ` [PATCH 1/4] gstreamer1.0-omx: provide RECIPE_NO_UPDATE_REASON Burton, Ross
@ 2016-09-09 7:42 ` Maxin B. John
0 siblings, 0 replies; 6+ messages in thread
From: Maxin B. John @ 2016-09-09 7:42 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
Hi Ross,
>On Thu, Sep 08, 2016 at 05:04:26PM +0100, Burton, Ross wrote:
>>On 8 September 2016 at 16:46, Maxin B. John <maxin.john@intel.com> wrote:
>>
>> +RECIPE_NO_UPDATE_REASON = "Version 1.9.2 requires gstreamer-1.0 >= 1.9.2"
>
>Are they adopting the GStreamer versioning style, so we should inherit upstream-version-is-even instead?
>
The number of gstreamer-1.0-omx releases seems to be pretty small compared
to other components of the gstreamer project. Seems like they are moving to
the GStreamer versioning style recently.
I will update this as per your suggestion.
> Ross
Thanks,
Maxin
^ permalink raw reply [flat|nested] 6+ messages in thread