From patchwork Sat Dec 21 02:45:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 1214412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-516433-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Nmoe313e"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="d1qw1viw"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47fqjx32TKz9sNH for ; Sat, 21 Dec 2019 13:45:54 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; q=dns; s=default; b=KZSpghjoVntrjdQ6 iwINNy2MvHMqTal5d1U7rd5IIF4d/bNjm8Uny0MrHk/1YqWNCCLZVhEDIqZgBXyR hMI9wYnydKZ29vvVqIZXhEBhpZV58HSf4/yDJpLZI4/BCMRdfTz4WYx2yirxe0/2 o41D5to6X0y9srTui/f2Wa6HFvo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; s=default; bh=7hbC6vZbVpY4loQbfuNSHH WcKIY=; b=Nmoe313et5vKzyBx+ZuFNLvLLCD+LGrzbts5HgOC/S6L8zu6GUAiQy xucVuUAq/4tbaq8LkkEPu0cGKL7/+JV77DMUotMWaXdwHudWq/gzBwyZJQE4Ua1g huV7IyfI93p5jHsN9W//UhU97zIa7UMi7n1UShN0GHuxNUNprD7U0= Received: (qmail 51599 invoked by alias); 21 Dec 2019 02:45:46 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 51575 invoked by uid 89); 21 Dec 2019 02:45:44 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-8.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=ensuring, H*MI:sk:1591100, H*f:sk:1591100, Oops X-HELO: esa1.hgst.iphmx.com Received: from esa1.hgst.iphmx.com (HELO esa1.hgst.iphmx.com) (68.232.141.245) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 21 Dec 2019 02:45:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1576896343; x=1608432343; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=cd7WKJomFt2DmKORwceemA1MM09wQV5sBmZiCB1PMj0=; b=d1qw1viw3K1KMi+c6G+81KylcEKBnNttBZK7Y5PxohKwzy2BFuLv277E nNFL37knsQOoSyjC14XG8n4RKxLD4RKIavjVxDmMGgke+3I/UePZgVmzC aqaJz8cgUlBMWtnan2tE6XDB1Cm00TS9V4jd6ALw2L3oyNd6fiOHWJyvH fv3l/s9tslU1yfN5V3v3iNrzsjDjnyOzaWB37lY+i1ZcXYFB/JcXSIKtT 0f9jzxciF+pIijZe2JlONAFkd//YiYBjJWEpZsS+kKpILP7lk/SFQq8ie KiXRwzHbgJRwPpfPobcN7YHEFKw+DPOM5nIqOIbfRh+84tPWw9Nf+33NF g==; IronPort-SDR: CdtOH+T/oXtbwywQo/U1GZ+6ySV76v6WQowvzzLoEQcvGQ1oowRJWZkSHFOKmHmW9yfBWqIAjd t6lyr5GMd1N43g1cqDZRuqX3BMBWeDmceh+Syz5FW9ZYezQGwBDYatsZdCKyJdoqNP7ew8NXyx ZG/qHkfizytj9UI8gqLwD7GWJ+GRr9ujC9zYHDVT5ysbmehKAbijZv5VuEqP+L4fjvv8tzXk5a X7+MtiKLkKSLbnlExS2FzwNgWlc9D53b9J6gmuEicFFQUlWAyzywL0gAvXYbfvErkDBYGq32yt m+8= Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 21 Dec 2019 10:45:41 +0800 IronPort-SDR: fP8yaVytPX6QQi3FaM61FoHxMmaMpNuU6ns7EFSEMMiQyZIKYsTBqWunWwLPgGKaQYBBxH1xSN /8gYwDlYS9DpCB6Ki9JGcInTP5/fsdPgdEOkKQ1+aA5Dyo4ZhzZrlukJ9g+wg4SDie9NtmngCM YETbdUOIML0Hy2lT0RYO2gOvDOWI1CW6N85n4a13PsqFf6z4cvEq8tTlhWAIFeSnKiLO5M7Mat K9lpJsFdMrpLa//80jZySWx5atuYs79TpWkgttOCSVhmnaWImi11VotrtXHy8yYECaA+TP7flz RIrKY2haSf6XyreYf5chujH4 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2019 18:39:39 -0800 IronPort-SDR: 79UblqdRfqwM6wsiDkXNTB3vfCaLcguHEKNEnA46fS80//pTXyp4hicAlAKFKVyFjYWrDRUcTo 547RkOgXH+2wJ2Ky3h/XI5S/2/BcEaA1X+vORYc6GU8Z+/ty3MaxTkPCgeGZKxkcpr5TOE6cA1 dKrFzFY72JZzxFfchNU/YGvUUn8oIjDzXa2fueJASv0b5xZxlhfGkT87vjgcAYlkpS644oeWS8 +pP0kI61tseBRJO9bYBOJK1DsYIEXhKYKL4tudBHm/URZeZhEx2VULsHvFIycTasvIvMsCbHT+ wSI= WDCIronportException: Internal Received: from unknown (HELO redsun52) ([10.149.66.28]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Dec 2019 18:45:41 -0800 Date: Sat, 21 Dec 2019 02:45:36 +0000 (GMT) From: "Maciej W. Rozycki" To: Eric Botcazou cc: gcc-patches@gcc.gnu.org Subject: [PATCH] libada: Fix shared library installation with `--disable-libada' In-Reply-To: <1591100.AcrPjTVl6q@polaris> Message-ID: References: <1591100.AcrPjTVl6q@polaris> User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Provide a default value of $(toolexeclibdir) for $(ADA_RTL_DSO_DIR), so that in a `--disable-libada' configuration `make install' places shared gnatlib libraries, built with `make -C gcc gnatlib-shared', in their intended version-specific location, fixing a commit r276424 ("libada: Respect `--enable-version-specific-runtime-libs'") regression. gcc/ada/ * gcc-interface/Makefile.in (toolexeclibdir): New variable. --- On Fri, 20 Dec 2019, Eric Botcazou wrote: > > I have rebuilt GCC with `--disable-libada' and it didn't cause any > > anomalies I could notice whether `--enable-version-specific-runtime-libs' > > or `--disable-version-specific-runtime-libs' has been used. I wouldn't > > expect any anyway, as shared libgnat and libgnarl libraries are not built > > in this case, so $(toolexeclibdir) is not supposed to be used. > > Yes, shared libraries are built with "make -C gcc gnatlib-shared gnattools". Oops, I think it was missed in the original review. Fixed thus, and verified with and without `--disable-libada', ensuring that shared libgnat and libgnarl libraries arrive at their intended places upon `make install'. OK to apply? Maciej --- gcc/ada/gcc-interface/Makefile.in | 6 ++++++ 1 file changed, 6 insertions(+) gcc-ada-toolexeclibdir.diff Index: gcc/gcc/ada/gcc-interface/Makefile.in =================================================================== --- gcc.orig/gcc/ada/gcc-interface/Makefile.in +++ gcc/gcc/ada/gcc-interface/Makefile.in @@ -880,6 +880,12 @@ b_gnatm.o : b_gnatm.adb $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN \ $< $(OUTPUT_OPTION) +# Provide a `toolexeclibdir' definition for when `gnat-install-lib' is +# wired through gcc/ in a configuration with top-level libada disabled. +# It will be overriden with the value configured when `gnat-install-lib' +# is invoked through libada/. +toolexeclibdir = $(ADA_RTL_OBJ_DIR) + ADA_INCLUDE_DIR = $(libsubdir)/adainclude ADA_RTL_OBJ_DIR = $(libsubdir)/adalib ADA_RTL_DSO_DIR = $(toolexeclibdir)