From nobody Sun Jul 09 17:52:07 2023 X-Original-To: dev-commits-src-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 4QzZTf72s2z4mVdv; Sun, 9 Jul 2023 17:52:08 +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 4QzZTM6sqzz3v3R; Sun, 9 Jul 2023 17:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925128; 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=tvhh/2XrraeGUYIJ7HgjdnhnkzvlKRGQEdnKnwYP7MU=; b=J8rWm4z0fqc9P65sBT5VBn4q1nsMn5dkWLUdRhcBHqVz5uRNTvB1uzJxZABO/M5UfPfJkE OLwFTs/EYEh9x0FdBFRyMRKP9pLi2KcoEMtp3ycMEF4750DBpuJ9bdBdOXCFg69UnCtQU3 UhjJ1lgN6ijNYnecgvzS3gPbzvcwm6Fnwexe5jrc64DUZ58k2BspBpCR3ILfi+LA+lKf3O X5d05M6rvYD2Md+JNbz4hseeZmuLwPphLVxQd8UKHeGK67GB+ibCxQ4rq4bGVoCQr3cjZT YY14pwOh7Qo3rlSWS+VDBp+nEC7NyTCuhM5Ekjcmdvnv7zEfj75cPHrpa4Z+HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925128; 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=tvhh/2XrraeGUYIJ7HgjdnhnkzvlKRGQEdnKnwYP7MU=; b=GCTo+5YIkdffg0S9tLd8xyaVJ9On7osOyU9dUB4KPNlsKLNMbPtstbUEwY413+b5gjiUQk gjXxwAIFgabJPMNtv86CErEePRLmRKTLqX69WNCNQSqvURzNxMDLpo5PMCHfbWsp/OIt0I kNmRVct1Q1k7TDkDS4Ld1ooI3Thgc07M0We6IqEeGvp2OiRQS5+5SkRTrqRcpCc65DroXn R0Nw6qRUYNvSGjOEqFJZsj/eyWThWSXGrtriS+lSq+z7GIfQw54YOvO0ix+YnBq6dP9sgf 9Hl928pmpUksJzXrWLVXxPfaGq4yHqk9n7f9yUwC/VyNm5DIRfXsIAvbAF6r3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925128; a=rsa-sha256; cv=none; b=PylIzno3Ho36mDiZn8S3YS8xPDXt1e4OcENdF71cDhOE927RB/DAqGcAO0ouuN0xcNRM0U sA+0JGwqUNjCH+t1QijzqOhJM7jLtTr87EHtSEI8c7kWlroBVyi7z53hMTEf0Vqnc/cYg/ cAiqvO52ho68btkzfi5HcAfkXBaggdJiuN2R5uXVKe1v3gz7FbUTvgq8k5WT4BOyRUXZwo xlKZsUlcg1ZkJ0z/2OBHtK272eD7AKmhG50ht+aVeTEAFpQnlSMVPUviu8gfHGC/iwuKge 8H14CC9f7kS57wfxm4XHqtaksdTc80ircPjpoPNUavKrTPxpdVi822T3OsfEEg== 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 4QzZTM5KtNz1BNk; Sun, 9 Jul 2023 17:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq7nH098763; Sun, 9 Jul 2023 17:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq71M098762; Sun, 9 Jul 2023 17:52:07 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:07 GMT Message-Id: <202307091752.369Hq71M098762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: d7be70f0ff9a - main - libiconv_modules: Migrate from COMPAT_32BIT to generic COMPAT_libcompat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7be70f0ff9a2a3cf2a980e5c8214666d85a463b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d7be70f0ff9a2a3cf2a980e5c8214666d85a463b commit d7be70f0ff9a2a3cf2a980e5c8214666d85a463b Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:35 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:35 +0000 libiconv_modules: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D40929 --- lib/libiconv_modules/Makefile.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index 364e78c9bf85..85600c84576e 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -7,10 +7,6 @@ CFLAGS+= -I${SRCTOP}/lib/libc/iconv CFLAGS+= -Dbool=_Bool -.if !defined(COMPAT_32BIT) -SHLIBDIR= /usr/lib/i18n -.else -SHLIBDIR= /usr/lib32/i18n -.endif +SHLIBDIR= /usr/lib${COMPAT_libcompat:U}/i18n LIBDIR= ${SHLIBDIR} MK_PROFILE= no