Bläddra i källkod

package/libv4l: fix TARGET_NLS_LIBS

When switching the build system to meson in buildroot commit
41ce1cc690b0837a1822079317bf317ddaeac17b the way TARGET_NLS_LIBS was
passed to the build system was not updated causing build errors.

Fixes:
http://autobuild.buildroot.net/results/96b/96b08078ea412b97a4719321ad0fdad4003e42c5/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Bernd Kuhls 9 månader sedan
förälder
incheckning
12649662b9
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      package/libv4l/libv4l.mk

+ 2 - 1
package/libv4l/libv4l.mk

@@ -10,6 +10,7 @@ LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
 LIBV4L_INSTALL_STAGING = YES
 LIBV4L_INSTALL_STAGING = YES
 LIBV4L_DEPENDENCIES = host-pkgconf
 LIBV4L_DEPENDENCIES = host-pkgconf
 LIBV4L_CONF_OPTS = -Ddoxygen-doc=disabled -Dqvidcap=disabled -Dv4l2-tracer=disabled
 LIBV4L_CONF_OPTS = -Ddoxygen-doc=disabled -Dqvidcap=disabled -Dv4l2-tracer=disabled
+LIBV4L_LDFLAGS = $(TARGET_LDFLAGS)
 
 
 # v4l-utils components have different licences, see v4l-utils.spec for details
 # v4l-utils components have different licences, see v4l-utils.spec for details
 LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPL-2.1+ (libraries)
 LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPL-2.1+ (libraries)
@@ -21,7 +22,7 @@ endif
 
 
 ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
 ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
 LIBV4L_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES)
 LIBV4L_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES)
-LIBV4L_CONF_ENV += LIBS=$(TARGET_NLS_LIBS)
+LIBV4L_LDFLAGS += $(TARGET_NLS_LIBS)
 endif
 endif
 
 
 LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)