From nobody Wed Nov 24 10:03:49 2021
X-Original-To: dev-commits-src-main@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 89BCC18AB202;
Wed, 24 Nov 2021 10:03:50 +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 4Hzc6G1MBFz3Fvc;
Wed, 24 Nov 2021 10:03:50 +0000 (UTC)
(envelope-from git@FreeBSD.org)
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 0E5F127EBD;
Wed, 24 Nov 2021 10:03:50 +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 1AOA3nFh008882;
Wed, 24 Nov 2021 10:03:49 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOA3nu8008881;
Wed, 24 Nov 2021 10:03:49 GMT
(envelope-from git)
Date: Wed, 24 Nov 2021 10:03:49 GMT
Message-Id: <202111241003.1AOA3nu8008881@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: git: fde3fc69cda8 - main - ncurses: to not create a libncursesw.a in the OBJDIR
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: bapt
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: fde3fc69cda865dc65b547411157b3ca7674c5dd
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1637748230;
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=MS5aw96liihsf4KYLibCceB1KOs//ndfdIUjxfmsjvc=;
b=nhYsNrtrkUF2rkBtNzSawgKfK0nchcFMjW28myokZa+0VMImJHkfUH2g62CQsB/J91gtwt
QgPT98w6dQ1WBnzPGzPxpRTgpAwiujN4KLb9ff8t/mAQVxrz7GOpfP47SHE0B7cySBYbNc
z5toLLc49WSIRitMCF6Y8L98WWtEU+tkh8QvzKcCoD1B3pcFYaOJvExFaFgNQGBHpf7F7k
YjXsf9p/QuRXSS6cslFOD4BjxP/ZXOX+bypWbwjOZw5VSS86CSt6b7UItSg57NnbLTqGpy
VIt7iv0a8B2VnF0OiBTDxGkxflLZZ2P4CIYJIXPa4hrUb0saYzaiZZhY2Ijc5w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637748230; a=rsa-sha256; cv=none;
b=LUFnaPtvIXmr3Udcik5iTszHNKz6unlLkVq+VX5SGak+dIdBoQXyYI2if/HX5lA2creDnR
wRmm9xurco77hxg6RVO5EIPei82l1JIAH3lUcRfYcbKzPxWByx3UaMZiXZ9WtucsNoUoNO
+pJC5uWFkFvUWOwkBX0MqdD0QC5qEFKgV9TPJYGuCueR5kKcYBgOPhysJb1MAKNc4GMwzf
e5fdwpcFmH0ZE7SEaZ07gBCHOnl/3gx7CpxJ20SQy680crEDxaJ51b0S7L12hlj8HDOOXw
h6yNwECYZ17EleyhlbapebcIezSnuadu5BVPUke7QdLmCFbhvuqBF2yh0EQYzg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=fde3fc69cda865dc65b547411157b3ca7674c5dd
commit fde3fc69cda865dc65b547411157b3ca7674c5dd
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-11-24 09:10:26 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-11-24 10:02:22 +0000
ncurses: to not create a libncursesw.a in the OBJDIR
It breaks intree partial builds for every library depending on ncurses
because ncursesw.a (built without PIC) will be the first the library
path for the linker to resolve -lncursesw
---
lib/ncurses/ncurses/Makefile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index af733d3ac613..45c8fcd11301 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -170,9 +170,11 @@ SYMLINKS+= libncursesw_p.a ${LIBDIR}/libcurses_p.a
LIBADD+= tinfow
SHLIB_LDSCRIPT= libncursesw.ldscript
STATIC_LDSCRIPT= libncursesw.aldscript
+CLEANFILES+= libncursesw.ald
+# Keep this for a while to ensure the file is removed during make clean
CLEANFILES+= libncursesw.a
-libncursesw.a: ${.CURDIR}/${STATIC_LDSCRIPT}
+libncursesw.ald: ${.CURDIR}/${STATIC_LDSCRIPT}
sed -e 's,@@LIB@@,${LIB},g' \
-e 's,@@STATICLIB_SUFFIX@@,${_STATICLIB_SUFFIX},g' \
${.ALLSRC} > ${.TARGET}
@@ -184,11 +186,11 @@ lib_gen.c: MKlib_gen.sh ${.OBJDIR:H}/tinfo/curses.h ncurses_dll.h
expanded.c: MKexpanded.sh
sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c
-all: ${STATIC_LDSCRIPT} libncursesw.a
+all: ${STATIC_LDSCRIPT} libncursesw.ald
-install-libncursesw.a: libncursesw.a
+install-libncursesw.a: libncursesw.ald
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} libncursesw.a ${DESTDIR}${_LIBDIR}/lib${LIB}.a
+ ${_INSTALLFLAGS} libncursesw.ald ${DESTDIR}${_LIBDIR}/lib${LIB}.a
realinstall: install-libncursesw.a