Message ID | 20240324174523.1770994-1-bernd@kuhls.net |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/libdrm: fix install of test programs | expand |
On Sun, 24 Mar 2024 18:45:23 +0100 Bernd Kuhls <bernd@kuhls.net> wrote: > Buildroot commit f95069814bd68cfc10ccf2dbc41efa6f1e127495 disabled the > build of test programs unconditionally without considering the option > BR2_PACKAGE_LIBDRM_INSTALL_TESTS. > > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> > --- > package/libdrm/libdrm.mk | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes: > Buildroot commit f95069814bd68cfc10ccf2dbc41efa6f1e127495 disabled the > build of test programs unconditionally without considering the option > BR2_PACKAGE_LIBDRM_INSTALL_TESTS. > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Committed to 2024.02.x, thanks.
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index a04331c2da..e0c1217b38 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -17,8 +17,7 @@ LIBDRM_DEPENDENCIES = \ LIBDRM_CONF_OPTS = \ -Dcairo-tests=disabled \ - -Dman-pages=disabled \ - -Dtests=false + -Dman-pages=disabled ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops @@ -109,10 +108,12 @@ LIBDRM_CONF_OPTS += -Dvalgrind=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_INSTALL_TESTS),y) -LIBDRM_CONF_OPTS += -Dinstall-test-programs=true +LIBDRM_CONF_OPTS += -Dtests=true -Dinstall-test-programs=true ifeq ($(BR2_PACKAGE_CUNIT),y) LIBDRM_DEPENDENCIES += cunit endif +else +LIBDRM_CONF_OPTS += -Dtests=false endif $(eval $(meson-package))
Buildroot commit f95069814bd68cfc10ccf2dbc41efa6f1e127495 disabled the build of test programs unconditionally without considering the option BR2_PACKAGE_LIBDRM_INSTALL_TESTS. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- package/libdrm/libdrm.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)