From patchwork Sat Dec 3 19:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Salvadore X-Patchwork-Id: 61410 X-Patchwork-Delegate: dmalcolm@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7DCBA3858408 for ; Sat, 3 Dec 2022 19:35:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7DCBA3858408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670096124; bh=xdrf2O5DN3ZxOqgMSWjVo3S2x1QYqhVkS9C52xiU0pQ=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=WhNYnmlLNlQehdNCmtE5H9B8/r7lRIW9uM1imJBojLA2Nt+pWZnaGDekAH4U9j7By c0LBLJcvGDsFk7/D5lY0l3AajoJj5Ru8Yn3rnzSaXOqcmYEUGWcLRluKMnvfkcXYEK DBZPhBeaFsUJTPUVvFgE0a0I8pEijPVjX83fQ5F4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-40136.proton.ch (mail-40136.proton.ch [185.70.40.136]) by sourceware.org (Postfix) with ESMTPS id 4FD683858D20 for ; Sat, 3 Dec 2022 19:34:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4FD683858D20 Date: Sat, 03 Dec 2022 19:34:42 +0000 To: "gcc-patches@gcc.gnu.org" , "jit@gcc.gnu.org" Cc: "dmalcolm@redhat.com" , "richard.guenther@gmail.com" Subject: Ping: [PATCH] jit: Install jit headers in $(libsubincludedir) [PR 101491] Message-ID: Feedback-ID: 53711648:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lorenzo Salvadore via Gcc-patches From: Lorenzo Salvadore Reply-To: Lorenzo Salvadore Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hello, Ping https://gcc.gnu.org/pipermail/gcc-patches/2022-November/606450.html Thanks, Lorenzo Salvadore --- From f8e2c2ee89a7d8741bb65163d1f1c20edcd546ac Mon Sep 17 00:00:00 2001 From: Lorenzo Salvadore Date: Wed, 16 Nov 2022 11:27:38 +0100 Subject: [PATCH] jit: Install jit headers in $(libsubincludedir) [PR 101491] Installing jit/libgccjit.h and jit/libgccjit++.h headers in $(includedir) can be a problem for machines where multiple versions of GCC are required simultaneously, see for example this bug report on FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257060 Hence, - define $(libsubincludedir) the same way it is defined in libgomp; - install jit/libgccjit.h and jit/libgccjit++.h in $(libsubincludedir). The patch has already been applied successfully in the official FreeBSD ports tree for the ports lang/gcc11 and lang/gcc12. Please see the following commits: https://cgit.freebsd.org/ports/commit/?id=0338e04504ee269b7a95e6707f1314bc1c4239fe https://cgit.freebsd.org/ports/commit/?id=f1957296ed2dce8a09bb9582e9a5a715bf8b3d4d gcc/ChangeLog: 2022-11-16 Lorenzo Salvadore PR jit/101491 * Makefile.in: Define and create $(libsubincludedir) gcc/jit/ChangeLog: 2022-11-16 Lorenzo Salvadore PR jit/101491 * Make-lang.in: Install headers in $(libsubincludedir) --- gcc/Makefile.in | 3 +++ gcc/jit/Make-lang.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) -- 2.38.0 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index f672e6ea549..3bcf1c491ab 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -635,6 +635,8 @@ libexecdir = @libexecdir@ # Directory in which the compiler finds libraries etc. libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) +# Directory in which the compiler finds headers. +libsubincludedir = $(libdir)/gcc/$(target_alias)/$(version)/include # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) # Directory in which all plugin resources are installed @@ -3642,6 +3644,7 @@ install-cpp: installdirs cpp$(exeext) # $(libdir)/gcc/include isn't currently searched by cpp. installdirs: $(mkinstalldirs) $(DESTDIR)$(libsubdir) + $(mkinstalldirs) $(DESTDIR)$(libsubincludedir) $(mkinstalldirs) $(DESTDIR)$(libexecsubdir) $(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(includedir) diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in index 248ec45b729..ba1b3e95da5 100644 --- a/gcc/jit/Make-lang.in +++ b/gcc/jit/Make-lang.in @@ -360,9 +360,9 @@ selftest-jit: # Install hooks: jit.install-headers: installdirs $(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \ - $(DESTDIR)$(includedir)/libgccjit.h + $(DESTDIR)$(libsubincludedir)/libgccjit.h $(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \ - $(DESTDIR)$(includedir)/libgccjit++.h + $(DESTDIR)$(libsubincludedir)/libgccjit++.h ifneq (,$(findstring mingw,$(target))) jit.install-common: installdirs jit.install-headers