Skip to contentSkip to conversation

package/wayland: bump to version 1.18.0

PATCH New James Hilliard 3 participants 9 messages Mar 3, 2020 – Apr 28, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Rebase/update disable tests patch.

Replace autotools build system with meson as autotools is deprecated and will be removed.

---
 ...01-build-add-option-to-disable-tests.patch | 104 ++++++++++++++++++
 ...onfigure-add-option-to-disable-tests.patch |  73 ------------
 package/wayland/wayland.hash                  |  12 +-
 package/wayland/wayland.mk                    |  16 +--
 4 files changed, 118 insertions(+), 87 deletions(-)
 create mode 100644 package/wayland/0001-build-add-option-to-disable-tests.patch
 delete mode 100644 package/wayland/0001-configure-add-option-to-disable-tests.patch
package/wayland/0001-build-add-option-to-disable-tests.patch new file +104 -0
new file mode 100644
index 0000000000..6ab695e909
@@ -0,0 +1,104 @@
+From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001
+From: James Hilliard <[email protected]>
+Date: Tue, 3 Mar 2020 15:27:51 -0700
+Subject: [PATCH] build: add option to disable tests
+
+When building for a product, tests are not needed.
+
+Besides, one test requires a C++ compiler, which is not always
+available.
+
+So, add an option to configure to disable building tests altogether.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+Signed-off-by: Alexey Brodkin <[email protected]>
+Signed-off-by: James Hilliard <[email protected]>
+[Upstream status:
+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66]
+---
+ Makefile.am       | 2 ++
+ configure.ac      | 9 +++++++++
+ meson.build       | 4 +++-
+ meson_options.txt | 4 ++++
+ 4 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cc87392..d5d43e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
+ include_HEADERS += egl/wayland-egl-backend.h
+ pkgconfig_DATA += egl/wayland-egl-backend.pc
+ 
++if ENABLE_TESTS
+ built_test_programs =				\
+ 	array-test				\
+ 	client-test				\
+@@ -295,6 +296,7 @@ os_wrappers_test_LDADD = libtest-runner.la
+ 
+ exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
+ exec_fd_leak_checker_LDADD = libtest-helpers.la
++endif
+ 
+ EXTRA_DIST += tests/scanner-test.sh			\
+ 	protocol/tests.xml				\
+diff --git a/configure.ac b/configure.ac
+index dda5e48..99b7c96 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries],
+ 	      [],
+ 	      [enable_libraries=yes])
+ 
++AC_ARG_ENABLE([tests],
++	      [AC_HELP_STRING([--disable-tests],
++			      [Disable compilation of test programs])],
++	      [],
++	      [enable_tests=yes])
++
++
+ AC_ARG_WITH([host-scanner],
+               [AC_HELP_STRING([--with-host-scanner],
+                               [Use installed wayland-scanner from host PATH during build])],
+@@ -99,6 +106,8 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
+ 
+ AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
+ 
++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes)
++
+ AC_ARG_WITH(icondir, [  --with-icondir=<dir>    Look for cursor icons here],
+ 		     [  ICONDIR=$withval],
+ 		     [  ICONDIR=${datadir}/icons])
+diff --git a/meson.build b/meson.build
+index 5632f4e..b37bb7a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -83,7 +83,9 @@ subdir('src')
+ if get_option('libraries')
+ 	subdir('cursor')
+ 	subdir('egl')
+-	subdir('tests')
++	if get_option('tests')
++		subdir('tests')
++	endif
+ endif
+ 
+ if get_option('documentation')
+diff --git a/meson_options.txt b/meson_options.txt
+index 76314f7..ab4be92 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,6 +2,10 @@ option('libraries',
+   description: 'Compile Wayland libraries',
+   type: 'boolean',
+   value: 'true')
++option('tests',
++  description: 'Compile Wayland tests',
++  type: 'boolean',
++  value: 'true')
+ option('documentation',
+   description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)',
+   type: 'boolean',
+-- 
+2.20.1
+
package/wayland/0001-configure-add-option-to-disable-tests.patch deleted +0 -73

73 lines not on this page · raw message

package/wayland/wayland.hash +6 -6
index 8774101884..abd8bcdf29 100644
@@ -1,8 +1,8 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html
-md5  d91f970aea11fd549eae023d06f91af3  wayland-1.17.0.tar.xz
-sha1 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600  wayland-1.17.0.tar.xz
-sha256 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4  wayland-1.17.0.tar.xz
-sha512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946  wayland-1.17.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html
+md5  23317697b6e3ff2e1ac8c5ba3ed57b65  wayland-1.18.0.tar.xz
+sha1  33e5292b32a115e829458ea627201ed1e4ad4f45  wayland-1.18.0.tar.xz
+sha256  4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d  wayland-1.18.0.tar.xz
+sha512  e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc  wayland-1.18.0.tar.xz
 
 # Locally calculated
-sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061  COPYING
+sha256  6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061  COPYING
package/wayland/wayland.mk +8 -8
index e325c6d752..6de92f63d9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.17.0
+WAYLAND_VERSION = 1.18.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
@@ -13,12 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
-# 0002-configure-add-option-to-disable-tests.patch
-WAYLAND_AUTORECONF = YES
+WAYLAND_CONF_OPTS = \
+	-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \
+	-Dtests=false \
+	-Ddocumentation=false
 
-# wayland-scanner is only needed for building, not on the target
-WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests
-HOST_WAYLAND_CONF_OPTS = --disable-tests
+HOST_WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false
 
 # Remove the DTD from the target, it's not needed at runtime
 define WAYLAND_TARGET_CLEANUP
@@ -26,5 +26,5 @@ define WAYLAND_TARGET_CLEANUP
 endef
 WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP
 
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+$(eval $(meson-package))
+$(eval $(host-meson-package))
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Hello James,

+Arnout, as there is a meson/pkg-config question.

Thanks for the patch. Two questions below.

Quoted 14 lines · On Tue, 3 Mar 2020 16:09:43 -0700 James Hilliard <[email protected]>…
package/wayland/wayland.mk +1 -1
index e325c6d752..6de92f63d9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.17.0
+WAYLAND_VERSION = 1.18.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 17

Quoted 7 lines
package/wayland/wayland.mk +2 -2
@@ -13,12 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
-# 0002-configure-add-option-to-disable-tests.patch
-WAYLAND_AUTORECONF = YES
+WAYLAND_CONF_OPTS = \
+	-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \

Are you sure this is needed since commit 4e0bc29993376613d200e892d491e31ea5a49622 ? Indeed, with this commit, meson is properly able to use pkg-config either for native builds or cross builds.

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 20

Quoted 5 lines
package/wayland/wayland.mk +2 -2
+	-Dtests=false \
+	-Ddocumentation=false
 
-# wayland-scanner is only needed for building, not on the target
-WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests

So how is the scanner thing working these days? With the meson build logic, it doesn't build the scanner when cross-compiling, and knows that it should use a pre-installed scanner ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Quoted 27 lines · Thomas Petazzoni

Hello James,

+Arnout, as there is a meson/pkg-config question.

Thanks for the patch. Two questions below.

Quoted 17 lines · On Tue, 3 Mar 2020 16:09:43 -0700 James Hilliard <[email protected]>…
package/wayland/wayland.mk +1 -1
index e325c6d752..6de92f63d9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.17.0
+WAYLAND_VERSION = 1.18.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
@@ -13,12 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
Quoted 9 lines

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 17

Quoted 4 lines
package/wayland/wayland.mk +2 -2
-# 0002-configure-add-option-to-disable-tests.patch
-WAYLAND_AUTORECONF = YES
+WAYLAND_CONF_OPTS = \
+     -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \

Are you sure this is needed since commit 4e0bc29993376613d200e892d491e31ea5a49622 ? Indeed, with this commit, meson is properly able to use pkg-config either for native builds or cross builds.

It was failing for me without this.

Quoted 10 lines

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 20

Quoted 6 lines
package/wayland/wayland.mk +2 -2
+     -Dtests=false \
+     -Ddocumentation=false
 
-# wayland-scanner is only needed for building, not on the target
-WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests

So how is the scanner thing working these days? With the meson build logic, it doesn't build the scanner when cross-compiling, and knows that it should use a pre-installed scanner ?

Yes, it knows there is a pre-installed scanner due to this:
-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig See:
https://github.com/wayland-project/wayland/blob/1.18.0/src/meson.build#L57-L59

Quoted 8 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#3 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Quoted 38 lines · James Hilliard
Quoted 27 lines · Thomas Petazzoni

Hello James,

+Arnout, as there is a meson/pkg-config question.

Thanks for the patch. Two questions below.

Quoted 17 lines · On Tue, 3 Mar 2020 16:09:43 -0700 James Hilliard <[email protected]>…
package/wayland/wayland.mk +1 -1
index e325c6d752..6de92f63d9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.17.0
+WAYLAND_VERSION = 1.18.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
@@ -13,12 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
Quoted 9 lines

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 17

Quoted 4 lines
package/wayland/wayland.mk +2 -2
-# 0002-configure-add-option-to-disable-tests.patch
-WAYLAND_AUTORECONF = YES
+WAYLAND_CONF_OPTS = \
+     -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \

Are you sure this is needed since commit 4e0bc29993376613d200e892d491e31ea5a49622 ? Indeed, with this commit, meson is properly able to use pkg-config either for native builds or cross builds.

Quoted 1 line

It was failing for me without this.

That means something is wrong with commit 4e0bc29933.

Ideally we should find out what exactly is going on here and make sure things
are done properly in our meson integration. Unfortunately, I don't have time to look at this myself for at least the coming 2 months. So I'm OK with merging this patch as is for the time being.

Quoted 10 lines
Quoted 10 lines

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 20

Quoted 6 lines
package/wayland/wayland.mk +2 -2
+     -Dtests=false \
+     -Ddocumentation=false
 
-# wayland-scanner is only needed for building, not on the target
-WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests

So how is the scanner thing working these days? With the meson build logic, it doesn't build the scanner when cross-compiling, and knows that it should use a pre-installed scanner ?

Quoted 4 lines

Yes, it knows there is a pre-installed scanner due to this:
-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig See:
https://github.com/wayland-project/wayland/blob/1.18.0/src/meson.build#L57-L59

AFAIU, meson doesn't have a way to build a program twice (once for target and
once for build), so the wayland mesonbuild uses a pre-installed one when cross-compiling.

A better solution for upstream wayland would probably be to repeat the
definition of wayland_scanner as wayland_scanner_for_build (with install: false and native: true).

Regards,
Arnout

Quoted 8 lines
Quoted 8 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#4 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Quoted 42 lines · Arnout Vandecappelle
Quoted 38 lines · James Hilliard
Quoted 36 lines · Thomas Petazzoni

Hello James,

+Arnout, as there is a meson/pkg-config question.

Thanks for the patch. Two questions below.

Quoted 14 lines · On Tue, 3 Mar 2020 16:09:43 -0700 James Hilliard <[email protected]>…
package/wayland/wayland.mk +1 -1
index e325c6d752..6de92f63d9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.17.0
+WAYLAND_VERSION = 1.18.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 17

Quoted 7 lines
package/wayland/wayland.mk +2 -2
@@ -13,12 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
-# 0002-configure-add-option-to-disable-tests.patch
-WAYLAND_AUTORECONF = YES
+WAYLAND_CONF_OPTS = \
+     -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \

Are you sure this is needed since commit 4e0bc29993376613d200e892d491e31ea5a49622 ? Indeed, with this commit, meson is properly able to use pkg-config either for native builds or cross builds.

Quoted 3 lines
Quoted 1 line

It was failing for me without this.

That means something is wrong with commit 4e0bc29933.

From what I can tell that change is for fixing a different issue.

Quoted 5 lines

Ideally we should find out what exactly is going on here and make sure things
are done properly in our meson integration. Unfortunately, I don't have time to look at this myself for at least the coming 2 months. So I'm OK with merging this patch as is for the time being.

By the way we do the same thing for weston, see:
https://github.com/buildroot/buildroot/blob/e0c5e294b939167ceda718a9729d6ddb64c3a4b3/package/weston/weston.mk#L17

Quoted 36 lines
Quoted 11 lines
Quoted 11 lines

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 20

Quoted 7 lines
package/wayland/wayland.mk +2 -2
+     -Dtests=false \
+     -Ddocumentation=false
 
-# wayland-scanner is only needed for building, not on the target
-WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests

So how is the scanner thing working these days? With the meson build logic, it doesn't build the scanner when cross-compiling, and knows that it should use a pre-installed scanner ?

Quoted 4 lines

Yes, it knows there is a pre-installed scanner due to this:
-Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig See:
https://github.com/wayland-project/wayland/blob/1.18.0/src/meson.build#L57-L59

AFAIU, meson doesn't have a way to build a program twice (once for target and
once for build), so the wayland mesonbuild uses a pre-installed one when cross-compiling.

A better solution for upstream wayland would probably be to repeat the
definition of wayland_scanner as wayland_scanner_for_build (with install: false and native: true).

Regards,
Arnout

Quoted 8 lines
Quoted 8 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#5 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Quoted 43 lines · James Hilliard
Quoted 42 lines · Arnout Vandecappelle
Quoted 38 lines · James Hilliard
Quoted 36 lines · Thomas Petazzoni

Hello James,

+Arnout, as there is a meson/pkg-config question.

Thanks for the patch. Two questions below.

Quoted 14 lines · On Tue, 3 Mar 2020 16:09:43 -0700 James Hilliard <[email protected]>…
package/wayland/wayland.mk +1 -1
index e325c6d752..6de92f63d9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.17.0
+WAYLAND_VERSION = 1.18.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 17

Quoted 7 lines
package/wayland/wayland.mk +2 -2
@@ -13,12 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
-# 0002-configure-add-option-to-disable-tests.patch
-WAYLAND_AUTORECONF = YES
+WAYLAND_CONF_OPTS = \
+     -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \

Are you sure this is needed since commit 4e0bc29993376613d200e892d491e31ea5a49622 ? Indeed, with this commit, meson is properly able to use pkg-config either for native builds or cross builds.

Quoted 4 lines
Quoted 3 lines
Quoted 1 line

It was failing for me without this.

That means something is wrong with commit 4e0bc29933.

From what I can tell that change is for fixing a different issue.

Right! I forgot - commit 4e0bc29933 was only handling it for target. For host,
we would need a native-compilation.conf. I had started on that but didn't finish it because I had no package to test it with. Hm, apparently I never even posted the WIP on the mailing list...

Anyway, good to now that I can test it with weston and wayland packages now.
When I have time (yeah, right) I can properly test that series.

Regards,
Arnout

#6 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Quoted 49 lines · Arnout Vandecappelle
Quoted 45 lines · James Hilliard
Quoted 44 lines · Arnout Vandecappelle
Quoted 39 lines · James Hilliard
Quoted 27 lines · Thomas Petazzoni

Hello James,

+Arnout, as there is a meson/pkg-config question.

Thanks for the patch. Two questions below.

Quoted 17 lines · On Tue, 3 Mar 2020 16:09:43 -0700 James Hilliard <[email protected]>…
package/wayland/wayland.mk +1 -1
index e325c6d752..6de92f63d9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.17.0
+WAYLAND_VERSION = 1.18.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
@@ -13,12 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
Quoted 9 lines

package/wayland/wayland.mk WAYLAND_INSTALL_STAGING = YES · line 17

Quoted 4 lines
package/wayland/wayland.mk +2 -2
-# 0002-configure-add-option-to-disable-tests.patch
-WAYLAND_AUTORECONF = YES
+WAYLAND_CONF_OPTS = \
+     -Dbuild.pkg_config_path=$(HOST_DIR)/lib/pkgconfig \

Are you sure this is needed since commit 4e0bc29993376613d200e892d491e31ea5a49622 ? Indeed, with this commit, meson is properly able to use pkg-config either for native builds or cross builds.

It was failing for me without this.

Quoted 7 lines
Quoted 2 lines
Quoted 1 line

That means something is wrong with commit 4e0bc29933.

From what I can tell that change is for fixing a different issue.

Right! I forgot - commit 4e0bc29933 was only handling it for target. For host,
we would need a native-compilation.conf. I had started on that but didn't finish it because I had no package to test it with. Hm, apparently I never even posted the WIP on the mailing list...

I managed to get it working properly here:
https://patchwork.ozlabs.org/project/buildroot/patch/20200428040638.122494-1-james.hilliard1 at gmail.com/

Quoted 6 lines

Anyway, good to now that I can test it with weston and wayland packages now.
When I have time (yeah, right) I can properly test that series.

Regards,
Arnout

#7 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Quoted 9 lines · On Mon, 27 Apr 2020 22:09:43 -0600 James Hilliard <[email protected]>…
Quoted 7 lines
Quoted 2 lines
Quoted 1 line

That means something is wrong with commit 4e0bc29933.

From what I can tell that change is for fixing a different issue.

Right! I forgot - commit 4e0bc29933 was only handling it for target. For host,
we would need a native-compilation.conf. I had started on that but didn't finish it because I had no package to test it with. Hm, apparently I never even posted the WIP on the mailing list...

I managed to get it working properly here:
https://patchwork.ozlabs.org/project/buildroot/patch/20200428040638.122494-1-james.hilliard1 at gmail.com/

I think Arnout wanted a native-compilation.conf instead of passing an extra argument so that it also works with people building stuff outside of Buildroot.

However, I don't get how this would have solved the problem as take
here: the issues we are seeing are with *target* packages, which are looking at using the host pkg-config. Which is exactly what 4e0bc29993376613d200e892d491e31ea5a49622 was supposed to fix. So I'm really confused.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH 1/1 package/wayland: bump to version 1.18.0

Quoted 11 lines · Thomas Petazzoni
Quoted 7 lines · On Mon, 27 Apr 2020 22:09:43 -0600 James Hilliard <[email protected]>…
Quoted 7 lines
Quoted 2 lines
Quoted 1 line

That means something is wrong with commit 4e0bc29933.

From what I can tell that change is for fixing a different issue.

Right! I forgot - commit 4e0bc29933 was only handling it for target. For host,
we would need a native-compilation.conf. I had started on that but didn't finish it because I had no package to test it with. Hm, apparently I never even posted the WIP on the mailing list...

Quoted 6 lines
Quoted 2 lines

I managed to get it working properly here:
https://patchwork.ozlabs.org/project/buildroot/patch/20200428040638.122494-1-james.hilliard1 at gmail.com/

I think Arnout wanted a native-compilation.conf instead of passing an extra argument so that it also works with people building stuff outside of Buildroot.

That apparently isn't really possible at the moment, although it looks like meson is
working on adding a config option for cross-compilation.conf in the future.

Quoted 6 lines

However, I don't get how this would have solved the problem as take
here: the issues we are seeing are with *target* packages, which are looking at using the host pkg-config. Which is exactly what 4e0bc29993376613d200e892d491e31ea5a49622 was supposed to fix. So I'm really confused.

That commit seems to only set the the pkg-config binary for the target package dependencies with native: true but not the proper host PKG_CONFIG_PATH.

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com