From patchwork Mon Oct 29 10:46:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 990120 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42kB9x2vCLz9s0t for ; Mon, 29 Oct 2018 21:47:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729711AbeJ2TfG (ORCPT ); Mon, 29 Oct 2018 15:35:06 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33993 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729146AbeJ2TfG (ORCPT ); Mon, 29 Oct 2018 15:35:06 -0400 Received: by mail-wr1-f65.google.com with SMTP id l6-v6so8119674wrt.1 for ; Mon, 29 Oct 2018 03:46:58 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=xm5gt/JgvDgxZ2VTF1J9XvFwLP8I8n1oDSDuti5sitU=; b=lpMsbaTXiAX9Y4Ng4a07N7n4N8OVMuwN15FSlKpcBowdWOIwMQAUyn0W5Pddlzod5j Ili8F84O+msdMwD5pAY7Kp697+tLDeOHACp4nJvUTtzu4jcXLa4VGQW7Conu4WFW0axA OR/C80oepAI3V9NVsueO+wU+urFVozulDnI2RDPpuQoyCN7u4IuRbVdlRpl18eSzm0uj CV56kAZK1xYIhvvzFJ3D4A9qeGojtgI7MyuIWs8a5FxT5zaSvbEpVBXv05nxkSe0zEVU zC+p0abJbLs4ZFiH4MnlpNaaJ0v0mjub0qG0jNhRXVier+z6/YyyvTnKVzFNu0Tj9DA8 8CgQ== X-Gm-Message-State: AGRZ1gLk1ctW79oVGq9oQL0teRFLHidoxS2nfkdmXVUSmvWa68FyytXl nq4jfvay7D3til5IakpkNUxtzMse X-Google-Smtp-Source: AJdET5cCVYhTYNj+Z6bAEJ8sC8JcMJx84mXq9mqXtT6aAS4nuk2M7L0hAJs0/4RPOynSpIY4bc4f4Q== X-Received: by 2002:a5d:40cc:: with SMTP id b12-v6mr3141112wrq.133.1540810017320; Mon, 29 Oct 2018 03:46:57 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id i204-v6sm21663559wmd.28.2018.10.29.03.46.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 03:46:55 -0700 (PDT) From: Luca Boccassi To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, dsahern@gmail.com Subject: [PATCH iproute2] Use libbsd for strlcpy if available Date: Mon, 29 Oct 2018 10:46:50 +0000 Message-Id: <20181029104650.24924-1-bluca@debian.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If libc does not provide strlcpy check for libbsd with pkg-config to avoid relying on inline version. Signed-off-by: Luca Boccassi --- This allows distro maintainers to be able to choose to reduce duplication and let this code be maintained in one place, in the external library. configure | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 744d6282..1dd9ce84 100755 --- a/configure +++ b/configure @@ -330,8 +330,16 @@ EOF then echo "no" else - echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG - echo "yes" + if ${PKG_CONFIG} libbsd --exists + then + echo 'CFLAGS += -include' `${PKG_CONFIG} libbsd --variable=includedir`'/bsd/string.h' \ + `${PKG_CONFIG} libbsd --cflags` >>$CONFIG + echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG + echo "no" + else + echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG + echo "yes" + fi fi rm -f $TMPDIR/strtest.c $TMPDIR/strtest }