From 0af286a6da20fa36eda5cd0a7a06c76f17ea6c1a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 22:48:47 +0200 Subject: [PATCH] iputils: remove libintl static linking handling We no longer support building the full-blown libintl in static linking scenarios, as it causes too many problems. Therefore, remove the special code that was handling this. Signed-off-by: Thomas Petazzoni --- package/iputils/iputils.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 57dc66067a..b20cd12b7a 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -36,13 +36,6 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) IPUTILS_MAKE_OPTS += USE_GCRYPT=yes IPUTILS_DEPENDENCIES += libgcrypt -# When gettext is enabled (BR2_PACKAGE_GETTEXT=y), and provides libintl -# (BR2_NEEDS_GETTEXT=y), libgpg-error will link with libintl, and libgpg-error -# is pulled in by libgcrypt. Since iputils doesn't use libtool, we have to link -# with libintl explicitly for static linking. -ifeq ($(BR2_STATIC_LIBS)$(BR2_NEEDS_GETTEXT)$(BR2_PACKAGE_GETTEXT),yyy) -IPUTILS_MAKE_OPTS += ADDLIB='-lintl' -endif else IPUTILS_MAKE_OPTS += USE_GCRYPT=no endif -- 2.30.2