From patchwork Thu Jan 31 11:38:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1034121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-495011-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hotmail.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="d4b7ESbm"; 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 43qyt238LXz9sBb for ; Thu, 31 Jan 2019 22:38:32 +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:from :to:cc:subject:date:message-id:content-type:mime-version; q=dns; s=default; b=ojg0FVAd+ZPqPAk+qwSAHddjoU5UNkFaz3Mgg3vko9cx/8sI/9 AG9Ybc4ow+VtOx6loQbtaG6WcHdtM7wBYMnvVwQFGd3JjVI8QqKxzo+G0haYs5rN /V4ZWkiXpesJWxxdaRX91fRaiuHHthGQ/XjjFOTUtI2TNbGdMfuKAjX6o= 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:from :to:cc:subject:date:message-id:content-type:mime-version; s= default; bh=8Q/G5uvhlAkbUfgcF9dWpurn2R8=; b=d4b7ESbmUvAKz6Nlpiny nKTfQwQaiMIunHU0f4MQS981FDHQ+Rp9/qswfEZyI2JpgzZqkyr8UrNlqRtAlJpx KyPJ3fZYU/FKv7BBkOBTOyOuClbqyFDw+iEyhH0wxHl02hR+jVYgdp2k4qqvUYR/ ucr/N0t+6VxtJorDG9jO7HA= Received: (qmail 20179 invoked by alias); 31 Jan 2019 11:38:26 -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 20169 invoked by uid 89); 31 Jan 2019 11:38:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TIME_LIMIT_EXCEEDED autolearn=unavailable version=3.3.2 spammy=silent, H*c:HHH X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Received: from mail-oln040092066079.outbound.protection.outlook.com (HELO EUR01-VE1-obe.outbound.protection.outlook.com) (40.92.66.79) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 31 Jan 2019 11:38:15 +0000 Received: from VE1EUR01FT010.eop-EUR01.prod.protection.outlook.com (10.152.2.57) by VE1EUR01HT197.eop-EUR01.prod.protection.outlook.com (10.152.2.241) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.10; Thu, 31 Jan 2019 11:38:12 +0000 Received: from VI1PR07MB4864.eurprd07.prod.outlook.com (10.152.2.60) by VE1EUR01FT010.mail.protection.outlook.com (10.152.2.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.10 via Frontend Transport; Thu, 31 Jan 2019 11:38:12 +0000 Received: from VI1PR07MB4864.eurprd07.prod.outlook.com ([fe80::ddcc:fc12:2074:191f]) by VI1PR07MB4864.eurprd07.prod.outlook.com ([fe80::ddcc:fc12:2074:191f%5]) with mapi id 15.20.1601.011; Thu, 31 Jan 2019 11:38:12 +0000 From: Bernd Edlinger To: Iain Buclaw CC: "gcc-patches@gcc.gnu.org" Subject: [PATCH, RFC] Avoid the -D option which is not available install-sh Date: Thu, 31 Jan 2019 11:38:12 +0000 Message-ID: MIME-Version: 1.0 Hi, I have an issue with the installation of gcc when configured with --enable-languages=all on an arm-target where install-sh is used, and make install fails at libphobos as follows: if test -f $file; then \ /home/ed/gnu/gcc-9-20190127-0/install-sh -c -m 644 -D $file /home/ed/gnu/arm-linux-gnueabihf/lib/gcc/armv7l-unknown-linux-gnueabihf/9.0.1/include/d/$file ; \ else \ /home/ed/gnu/gcc-9-20190127-0/install-sh -c -m 644 -D ../../../../gcc-9-20190127-0/libphobos/libdruntime/$file \ /home/ed/gnu/arm-linux-gnueabihf/lib/gcc/armv7l-unknown-linux-gnueabihf/9.0.1/include/d/$file ; \ fi ; \ done /home/ed/gnu/gcc-9-20190127-0/install-sh: invalid option: -D /home/ed/gnu/gcc-9-20190127-0/install-sh: invalid option: -D /home/ed/gnu/gcc-9-20190127-0/install-sh: invalid option: -D ... I have fixed the installation with the attached patch, but when I regenerate the automake files using automake-1.15.1 and autoconf-2.69, I have an issue that apparently the configure.ac must be out of sync, and the the generated files are missing the option --runstatedir no matter what I do. At least on the source RFC, because I am not sure what the --runstatedir option is, and if it is intentional to remove, and forgotten to re-generate, or if was intended to add, and forgotten to check in the configure.ac. Attached patch which fixes the install issue, and removes the --runstatedir configure option. Is OK as is, or has anybody an idea how to fix this mess? Thanks Bernd. 2019-01-31 Bernd Edlinger * src/Makefile.am: Avoid the -D option which is not available with the install-sh fallback. Use $(MKDIR_P) instead. * libdruntime/Makefile.am: Likewise. * configure: Regenerated. * Makefile.in: Regenerated. * src/Makefile.in: Regenerated. * libdruntime/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. diff -ur libphobos/configure libphobos/configure --- libphobos/configure 2019-01-27 23:33:11.000000000 +0100 +++ libphobos/configure 2019-01-31 09:17:08.788970961 +0100 @@ -782,7 +782,6 @@ docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -868,7 +867,6 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1121,15 +1119,6 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1267,7 +1256,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1420,7 +1409,6 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -11508,7 +11496,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11511 "configure" +#line 11499 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11614,7 +11602,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11617 "configure" +#line 11605 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff -ur libphobos/libdruntime/Makefile.am libphobos/libdruntime/Makefile.am --- libphobos/libdruntime/Makefile.am 2019-01-01 13:31:55.000000000 +0100 +++ libphobos/libdruntime/Makefile.am 2019-01-31 08:29:02.489565809 +0100 @@ -139,11 +139,12 @@ # Handles generated files as well install-data-local: + $(MKDIR_P) $(DESTDIR)$(gdc_include_dir) for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done diff -ur libphobos/libdruntime/Makefile.in libphobos/libdruntime/Makefile.in --- libphobos/libdruntime/Makefile.in 2018-11-28 18:54:07.000000000 +0100 +++ libphobos/libdruntime/Makefile.in 2019-01-31 09:12:59.007294461 +0100 @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for the D runtime library. -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2019 Free Software Foundation, Inc. # # GCC is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -656,7 +656,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -2170,11 +2169,12 @@ # Handles generated files as well install-data-local: + $(MKDIR_P) $(DESTDIR)$(gdc_include_dir) for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done diff -ur libphobos/Makefile.in libphobos/Makefile.in --- libphobos/Makefile.in 2019-01-27 23:33:11.000000000 +0100 +++ libphobos/Makefile.in 2019-01-31 09:12:58.954295271 +0100 @@ -15,7 +15,7 @@ @SET_MAKE@ # Makefile for the toplevel directory of the D Standard library. -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2019 Free Software Foundation, Inc. # # GCC is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -319,7 +319,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -ur libphobos/src/Makefile.am libphobos/src/Makefile.am --- libphobos/src/Makefile.am 2019-01-01 13:31:55.000000000 +0100 +++ libphobos/src/Makefile.am 2019-01-31 07:54:36.457355901 +0100 @@ -92,11 +92,12 @@ # Handles generated files as well install-data-local: + $(MKDIR_P) $(DESTDIR)$(gdc_include_dir) for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done diff -ur libphobos/src/Makefile.in libphobos/src/Makefile.in --- libphobos/src/Makefile.in 2019-01-27 23:33:11.000000000 +0100 +++ libphobos/src/Makefile.in 2019-01-31 09:12:59.081293328 +0100 @@ -610,7 +610,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1647,11 +1646,12 @@ # Handles generated files as well install-data-local: + $(MKDIR_P) $(DESTDIR)$(gdc_include_dir) for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \ if test -f $$file; then \ - $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ + $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \ else \ - $(INSTALL_HEADER) -D $(srcdir)/$$file \ + $(INSTALL_HEADER) $(srcdir)/$$file \ $(DESTDIR)$(gdc_include_dir)/$$file ; \ fi ; \ done diff -ur libphobos/testsuite/Makefile.in libphobos/testsuite/Makefile.in --- libphobos/testsuite/Makefile.in 2019-01-27 23:33:11.000000000 +0100 +++ libphobos/testsuite/Makefile.in 2019-01-31 09:12:59.094293130 +0100 @@ -265,7 +265,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@