From nobody Wed Jan 25 16:28:35 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P28R73rKXz3brYT; Wed, 25 Jan 2023 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P28R73JYNz4Nw0; Wed, 25 Jan 2023 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674664115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E3MB0ufUj6b2NEiQAZb/XrXtCfFCzt5+bCiRqNZ0pjU=; b=h7hDO3uufAzzPiBoxbe6gDQDkHwYffLzbaU1d2Lzkbc9Ke2xtRJys9SEU2pzucBE4wkT9B MfyDbJbSIDH5rJa1xfKkAElHqM1n7pMQjcFJ/dNr+r4WLh3YxXXXJ3PbFnohsaVDleO9pj njQogvtDy+cxXSoJXA34B1EqiW9vtf38TCVRrxXRO/4GwATLSzPCWTHwh0EFznxK+BusDn 3FJzZbzZJmkK/8L+gQ47sdmA5ToQYfT03jGhgjHKYraOhTMIt1b4h9nIgdSc1E6h9cg/Qs xp402b4t2wch2XWGW3t8/VlhuAx5+ny8ovw6Lfi3IPS03RVho3Kz9IscuMfp5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674664115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E3MB0ufUj6b2NEiQAZb/XrXtCfFCzt5+bCiRqNZ0pjU=; b=J3o5mRNDONhISG9O5VAqLaCfaboGTKflJjFOKE7JyXMvE7ZLuSZPU9cgDOSTlxFKgb3h3+ Fh+jNwdhFYnUXUYxT5LAjF+qoSJHMq8L3TQ4kZH9W0ZcIVqKd3baYCF9IUAYq7J0XHZhLo Xw3ErKJnQqeAasbo5RZsjmWxN0s4a1QhfQxOcwbXlZIm9xUrRnyyfYiylZN2YHgy1MMUkv BelVHfQy1RrfQSLWyDwleTaRi6FdURnPns8bgEHmYpuEcNh9C8MMlkNVOKhv+pxla3q51z PbFSW7HXL2rKUBzN7dtu0gJuRJX0wpBWv/nBiWBUb/1kV2ywnzS36Ghgj356fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674664115; a=rsa-sha256; cv=none; b=di36xT06DRhu+LgBDvcieFh0GMsmSlhyxuzWY9gnHmn8t894a6HNrMp/t9lYUjp1c3M3Ej SY0ANUyIaai9BqXsCEP+77OTFYLZqmtVMrUWXeWaPKiEExBXUkjk8dqB0WxnlwC8M4ymvp y4UTakUtzAMnMJCvKBoAP3UCf5ep3wpz8+lmeye/lyMh1KHfS4kds8fi2wTDDeHS06aKAm nSqc2rHgyNknyhu5ua9WdEORX98pDaOqneL9UfxMt6SjZEPLYfBEje374EdyJR9YLjIXIx Qyzeqqmn39BF9PQU5itoaPZG6N6mNgEQ3Rugl4wYtFbgFRA3VCvNUJqann7WEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P28R72NMWzvlR; Wed, 25 Jan 2023 16:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30PGSZQQ059871; Wed, 25 Jan 2023 16:28:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PGSZBk059870; Wed, 25 Jan 2023 16:28:35 GMT (envelope-from git) Date: Wed, 25 Jan 2023 16:28:35 GMT Message-Id: <202301251628.30PGSZBk059870@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: d966de5a7dd6 - main - devel/elfutils: Fix build with disabled NLS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d966de5a7dd68918795218e7ee75da149fb17e06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=d966de5a7dd68918795218e7ee75da149fb17e06 commit d966de5a7dd68918795218e7ee75da149fb17e06 Author: Dmitry Marakasov AuthorDate: 2023-01-25 16:09:41 +0000 Commit: Dmitry Marakasov CommitDate: 2023-01-25 16:25:04 +0000 devel/elfutils: Fix build with disabled NLS libintl.h is included unconditionally, but gettext include path is not added to CFLAGS when gettext is disabled, so the compilation fails: cc ... -I. -I.. -I. -I. -I../lib -I.. -I./../libelf ... -I/usr/local/share/gnulib/lib ... -o xasprintf.o xasprintf.c xasprintf.c:36:10: fatal error: 'libintl.h' file not found So always add LOCALBASE/include to CFLAGS for libintl.h to be available. Note that the order is important and it should appear before gnulib includes, otherwise wrong argp.h gets included. Approved by: portmgr blanket --- devel/elfutils/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile index a06ff3ff739f..e810b0382271 100644 --- a/devel/elfutils/Makefile +++ b/devel/elfutils/Makefile @@ -22,7 +22,8 @@ BUILD_DEPENDS= gnulib>=0:devel/gnulib PLIST_SUB= VERSION=${PORTVERSION} -CFLAGS+= -I${LOCALBASE}/share/gnulib/lib +CFLAGS+= -I${LOCALBASE}/include \ + -I${LOCALBASE}/share/gnulib/lib LDFLAGS+= ${LOCALBASE}/lib/libargp.so \ ${LOCALBASE}/lib/libintl.so