From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-4022.proton.ch (mail-4022.proton.ch [185.70.40.22]) by sourceware.org (Postfix) with ESMTPS id 1CF253858D39 for ; Sat, 3 Dec 2022 19:34:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1CF253858D39 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=lorenzosalvadore.it Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lorenzosalvadore.it Date: Sat, 03 Dec 2022 19:34:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lorenzosalvadore.it; s=protonmail; t=1670096093; x=1670355293; bh=xdrf2O5DN3ZxOqgMSWjVo3S2x1QYqhVkS9C52xiU0pQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=b39u343vASpMt3JoJO9uEY3iP3xJCeKyRqLe0tA9C2Jm++1Fk6tC+HSbXb+FYSIXo JdP/xSgeDEZIAFK4wfpAzVZ/6a4Ok+VjuOQWUFA/bOZAHOUhbY2jKLbtiBZBZLCOp1 q/wo5/ZLSvRtTScOeWrgicXJqKaa5uvb5rmNhsYNIEUenG3pWZ+nENCZfaUSyROVEY 8R4psSLvEaCxN4opkXCHSPvkkzHtnhpryj30LuE9YXhjnFsMAUPm+P/U9UsizQajre Y2BM0rrigoQo2OmjOuvelxCIt27cmJ/eSWnZnKDDLJT5wx+HVG1WdUJoOlwZMg7VZH Md0KWV2HKI1Bw== To: "gcc-patches@gcc.gnu.org" , "jit@gcc.gnu.org" From: Lorenzo Salvadore 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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=3D257060 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=3D0338e04504ee269b7a95e6707f1314b= c1c4239fe https://cgit.freebsd.org/ports/commit/?id=3Df1957296ed2dce8a09bb9582e9a5a71= 5bf8b3d4d gcc/ChangeLog: 2022-11-16 Lorenzo Salvadore =09PR jit/101491 * Makefile.in: Define and create $(libsubincludedir) gcc/jit/ChangeLog: 2022-11-16 Lorenzo Salvadore =09PR 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(-) 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 =3D @libexecdir@ # Directory in which the compiler finds libraries etc. libsubdir =3D $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_= dir_suffix) +# Directory in which the compiler finds headers. +libsubincludedir =3D $(libdir)/gcc/$(target_alias)/$(version)/include # Directory in which the compiler finds executables libexecsubdir =3D $(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: =09$(mkinstalldirs) $(DESTDIR)$(libsubdir) +=09$(mkinstalldirs) $(DESTDIR)$(libsubincludedir) =09$(mkinstalldirs) $(DESTDIR)$(libexecsubdir) =09$(mkinstalldirs) $(DESTDIR)$(bindir) =09$(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 =09$(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \ -=09 $(DESTDIR)$(includedir)/libgccjit.h +=09 $(DESTDIR)$(libsubincludedir)/libgccjit.h =09$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \ -=09 $(DESTDIR)$(includedir)/libgccjit++.h +=09 $(DESTDIR)$(libsubincludedir)/libgccjit++.h ifneq (,$(findstring mingw,$(target))) jit.install-common: installdirs jit.install-headers -- 2.38.0