From patchwork Sat May 19 18:58:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 916911 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.136; helo=silver.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="UH9Ir+Xp"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40pDpX42wDz9s3x for ; Sun, 20 May 2018 04:58:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4F70922EA2; Sat, 19 May 2018 18:58:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h0-78-cOi+IU; Sat, 19 May 2018 18:58:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 69843226E3; Sat, 19 May 2018 18:58:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5132D1C0A11 for ; Sat, 19 May 2018 18:58:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4E2E788985 for ; Sat, 19 May 2018 18:58:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lgUkFQyWyK+o for ; Sat, 19 May 2018 18:58:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0174788979 for ; Sat, 19 May 2018 18:58:34 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id 94-v6so12225377wrf.5 for ; Sat, 19 May 2018 11:58:34 -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=13Wi+bLhZZpLo/Z0u1udjb5j+AbWNLWaWxI/IZKd3bw=; b=UH9Ir+XpwFJjoJp3bMPIifLVfIs0YEu/23DhAnFioo86q1tLB/7MTgkTBscQzMzhWm M/NV7/V8OfPWwGBtkXATUvvoB73W2XbzhCXDyG7hANnW/bWvhE9JtgWuXJLgObvMijAg fYPllqZ8MeO+WvB3xVRXjjrumxlgBGrjcB/TWLH2OJlD5nJtoTcG5Tei+SeyGae/cjcc 9ks38nVyba6DsEtTOg+d3OZVbZa7G7snMzq4NTf2d8FHWL2FDvtkGKJEAx5LlqjvArHi vjdjrykP9KNufb1zGAQM7+0EE/GWtSLZJP+BBWWiMCv779JpK/CXenSZLWMqJ+lXUvfd KOvQ== 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=13Wi+bLhZZpLo/Z0u1udjb5j+AbWNLWaWxI/IZKd3bw=; b=RMYaXrUXFUHlC+Xt5x9IkLbMX8VjcyVw+lGkTpnbs1LlaWfZFsuNlOsD42/gvCYoq4 AThsXKHRrZ/NTsM9d56nd4073LfUEcVbRKXiPK1l62mMg540j7oPTiJ9cgNc2BMnSmyH ic1yoocZwisPwgHorEDT8DokWvia6EXMQOl9Lf27DPIJ5aorJfRPrCD1ere6XEjFGwIQ DvJCxm0N8mnTgy06SgePTvPhOODluXDEMEYARzt9pFet7GLp4eHaX59ZVPxKIJRuCeFi POdIomrO+PdcwVs6rd7EA8FCFu2juNTnDFxeBBYwi2eb5gbrPN/UdF/GieKKiOURtpdw SkVQ== X-Gm-Message-State: ALKqPwdg0MPAhnMWAomE5YiBfPp4Y6V6YyCqN2Uuzp8e+51r72WB+J4H 0C3dZVlUX1Gc5uqDq6hEOnvE0tdb X-Google-Smtp-Source: AB8JxZqTLm0mdp9YDEf7Zw6+gLAXAgT/ninX/NJsOejX5bJAYQX+efUzkJGZdiwoskZgCw163QGFUg== X-Received: by 2002:adf:c4b6:: with SMTP id m51-v6mr11155259wrf.126.1526756312838; Sat, 19 May 2018 11:58:32 -0700 (PDT) Received: from adeos.home (2a01cb00054978001a46adb371a118d7.ipv6.abo.wanadoo.fr. [2a01:cb00:549:7800:1a46:adb3:71a1:18d7]) by smtp.gmail.com with ESMTPSA id o101-v6sm13828971wrb.44.2018.05.19.11.58.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 May 2018 11:58:32 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 19 May 2018 20:58:26 +0200 Message-Id: <20180519185827.23898-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH v4 for-next 1/2] package/exim: remove libnsl linking 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: Luca Ceresoli , Romain Naour MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" glibc now considers its built-in libnsl as being obsolete, and requires passing --enable-obsolete-libnsl to have it built and installed. libnsl is now provided as a separate project [1], but it isn't packaged yet in Buildroot. In preparation for dropping --enable-obsolete-libnsl from the glibc package, this commit ensures that exim doesn't use libnsl. It was already the case for uclibc and musl toolchains, so this commit simply extends that to make sure libnsl is also not used with glibc toolchains. Only Exim's nis.so and nisplus.so lookup modules require libnsl, but they are not build by default. So we can safely remove -lnsl from the Makefile-Linux. If someone want these modules, a new libnsl package must be added first to provide nsl library. Since we remove -lnsl unconditionally, use a patch instead of a sed command. [1] https://github.com/thkukuk/libnsl.git [2] https://fedoraproject.org/wiki/Changes/NISIPv6 Signed-off-by: Romain Naour Cc: Baruch Siach Cc: Luca Ceresoli --- v4: remove -lnsl by a patch instread of a sed (Baruch). v3: Also comment the buildconfig build issue on the host with Fedora 28 (Luca) Add a comment about this issue in exim.mk --- package/exim/0006-remove-libnsl.patch | 37 +++++++++++++++++++++++++++++++++++ package/exim/exim.mk | 9 --------- 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 package/exim/0006-remove-libnsl.patch diff --git a/package/exim/0006-remove-libnsl.patch b/package/exim/0006-remove-libnsl.patch new file mode 100644 index 0000000000..8ca53c9acb --- /dev/null +++ b/package/exim/0006-remove-libnsl.patch @@ -0,0 +1,37 @@ +From b722f8fc01f6b1d71c98c0c66f759935b0dac136 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sat, 19 May 2018 20:36:41 +0200 +Subject: [PATCH] remove libnsl + +glibc now considers its built-in libnsl as being obsolete, and requires +passing --enable-obsolete-libnsl to have it built and installed. libnsl +is now provided as a separate project [1], but it isn't packaged yet in +Buildroot. + +Exim's nis.so and nisplus.so lookup modules require libnsl, +but they are not build by default. So we can safely remove -lnsl +from the Makefile-Linux. + +[1] https://github.com/thkukuk/libnsl.git + +Signed-off-by: Romain Naour +--- + OS/Makefile-Linux | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/OS/Makefile-Linux b/OS/Makefile-Linux +index 990f884..ea5644b 100644 +--- a/OS/Makefile-Linux ++++ b/OS/Makefile-Linux +@@ -19,7 +19,7 @@ CFLAGS_DYNAMIC ?= -shared -rdynamic + DBMLIB = -ldb + USE_DB = yes + +-LIBS = -lnsl -lcrypt -lm ++LIBS = -lcrypt -lm + LIBRESOLV = -lresolv + + X11=/usr/X11R6 +-- +2.14.3 + diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 37eab501a4..bde2df1153 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -72,14 +72,6 @@ define EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL endef endif -# only glibc provides libnsl, remove -lnsl for all other toolchains -# http://bugs.exim.org/show_bug.cgi?id=1564 -ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) -define EXIM_REMOVE_LIBNSL_FROM_MAKEFILE - $(SED) 's/-lnsl//g' $(@D)/OS/Makefile-Linux -endef -endif - # musl does not provide struct ip_options nor struct ip_opts (but it is # available with both glibc and uClibc) ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) @@ -96,7 +88,6 @@ define EXIM_CONFIGURE_TOOLCHAIN $(call exim-config-add,RANLIB,$(TARGET_RANLIB)) $(call exim-config-add,HOSTCC,$(HOSTCC)) $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) - $(EXIM_REMOVE_LIBNSL_FROM_MAKEFILE) $(EXIM_FIX_IP_OPTIONS_FOR_MUSL) endef