crelay: Fix link error with BUILD_NLS=y

Signed-off-by: Ted Hess <thess@kitschensync.net>

diff --git a/utils/crelay/Makefile b/utils/crelay/Makefile
index 8a5f7dc90d309e978809c4552e62f1a32e38668f..04fa0ae26abf98af22ee82959d2c3493e2b2f574 100644 (file)
--- a/utils/crelay/Makefile
+++ b/utils/crelay/Makefile
@@ -22,6 +22,7 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/crelay
   SECTION:=utils
@@ -52,6 +53,7 @@ TARGET_CFLAGS+= \
        -I$(STAGING_DIR)/usr/include/libftdi1 \
        -I$(STAGING_DIR)/usr/include/hidapi
 
+TARGET_LDFLAGS+= $(if $(ICONV_FULL),-liconv)
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)/src \

diff --git a/utils/crelay/patches/020-link_using_LDFLAGS.patch b/utils/crelay/patches/020-link_using_LDFLAGS.patch
new file mode 100644 (file)
index 0000000..9154b08
--- /dev/null
+++ b/utils/crelay/patches/020-link_using_LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -61,7 +61,7 @@ all: $(BIN)
+ 
+ $(BIN):       $(OBJ)
+       @echo "[Link $(BIN)] with libs $(LIBS)"
+-      @$(CC) -o $(BIN) $(OBJ) $(LIBS)
++      @$(CC) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIBS)
+ 
+ .c.o:
+       @echo "[Compile $<]"