From patchwork Tue May 1 13:10:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 907047 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e7ygEtqW"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40b1x24jFYz9s0W for ; Tue, 1 May 2018 23:10:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3BFF287A11; Tue, 1 May 2018 13:10:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BWIO6DVLXYDL; Tue, 1 May 2018 13:10:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C9AAA879A4; Tue, 1 May 2018 13:10:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 574001BFFDD for ; Tue, 1 May 2018 13:10:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 53F9D879A4 for ; Tue, 1 May 2018 13:10:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xwT3imsJLYVD for ; Tue, 1 May 2018 13:10:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 43ACB878CB for ; Tue, 1 May 2018 13:10:21 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id o78so19028240wmg.0 for ; Tue, 01 May 2018 06:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Shb4LnG/SY9R0SbJraiupKJyLJ1mR/UYiiM5m0u+nac=; b=e7ygEtqWwLx4QPfYHcmt3dyfZXXK7oDH9yL9YSY9RnoG00wnGmM42IRfTiXp13AiiM hx7jbRSiQsr5fJ2v2ppzp2Kd9cCMymA8qFe3S8g66wEX4WyjhM4/F6+UgJnTAl9BEh6O NbbX3XApjc0j/8BnduRKbeR2WbL8CEZzCheNE8Ofb2gxyM1Z5GM+SSyEh1i+qoCnvd/N Kd1RUaNSuN+v7r00IKceaYmDLhBRFMctbcbOPkZbJMAkhvMzvCFX6s5/iTBCCITbmaUt kifo2lZz/6icYJcOoRqhwP0KsE1vbf9A14YHRNSTyhx4hIw89QLROTOOj3/xSmcnNEqz NTVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Shb4LnG/SY9R0SbJraiupKJyLJ1mR/UYiiM5m0u+nac=; b=s8+7KIscsAxmI3MTsygmqlRitktp8iAXtp7DyM+pRkKDbdzVc0GaYMV5mtk1Mn5q2P yGwYNTnwZJXJtgdFE8mMMMsq9/2XIR2HEJ3VQIlndcHGdo+YUo/mLhOV14qBagChtNek QY26tQRZa448/6PjkRn1nbT4Hsyg2IbmEnqqP5gNEXkgohIR3ma6OlWRhX7rM9JotWxo wrObr9P+8JXHc0fuyT7FoQkxq+/mqkEqvBnfOCt00WatnMybac0/wuEsiA7RETiIvFuL b9zoCuHPTAS+Z1mEIoDi25mw3q6sQqIwNRvOgzoyw+Me5igVwi+jMOAomjbS6nRc8xl9 EaGQ== X-Gm-Message-State: ALQs6tBJvbRxa9JQAwLdaYTter50KSQ+W2IKHjZjyEOwxmDNrJlU3QtO 361615KAXYazprkUiIhvndIy/Q== X-Google-Smtp-Source: AB8JxZrlHvyfIa1LFEx8AjTXxuo42hIcrpXjcyi04JLqErKPKrXtV2jIdLGv2hqCzGUrtt4yLcdNog== X-Received: by 10.28.109.71 with SMTP id i68mr6208236wmc.154.1525180219374; Tue, 01 May 2018 06:10:19 -0700 (PDT) Received: from fabrice-VirtualBox.home (ARennes-656-1-200-77.w2-11.abo.wanadoo.fr. [2.11.116.77]) by smtp.gmail.com with ESMTPSA id x128sm1089547wmg.2.2018.05.01.06.10.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 06:10:18 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 1 May 2018 15:10:08 +0200 Message-Id: <20180501131008.30114-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] dnsmasq: NLS/i18n does not mandate libidn anymore X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since May 2017, automatic inclusion of IDN has been removed when building internationalisation support: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=43cdf1c3d074e75389392d495690923ef37d3248 This patch is a first step before the addition of libidn2 package Signed-off-by: Fabrice Fontaine --- package/dnsmasq/dnsmasq.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index f519835828..79c5619966 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -9,11 +9,14 @@ DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" -DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" -DNSMASQ_DEPENDENCIES = host-pkgconf +DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ + LIBS+=$(TARGET_NLS_LIBS) +DNSMASQ_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 +DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) + ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) DNSMASQ_COPTS += -DNO_DHCP endif @@ -30,12 +33,9 @@ ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) DNSMASQ_COPTS += -DNO_TFTP endif -# NLS requires IDN so only enable it (i18n) when IDN is true ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) -DNSMASQ_DEPENDENCIES += libidn $(TARGET_NLS_DEPENDENCIES) -DNSMASQ_MAKE_OPTS += LIBS+=$(TARGET_NLS_LIBS) +DNSMASQ_DEPENDENCIES += libidn DNSMASQ_COPTS += -DHAVE_IDN -DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) endif ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)