public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH, RFC] Avoid the -D option which is not available install-sh
@ 2019-01-31 11:40 Bernd Edlinger
  2019-01-31 12:30 ` Rainer Orth
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Bernd Edlinger @ 2019-01-31 11:40 UTC (permalink / raw)
  To: Iain Buclaw; +Cc: gcc-patches

[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]

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.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch-libphobos-install.diff --]
[-- Type: text/x-patch; name="patch-libphobos-install.diff", Size: 7700 bytes --]

2019-01-31  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* 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@

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-02-18 22:25 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-31 11:40 [PATCH, RFC] Avoid the -D option which is not available install-sh Bernd Edlinger
2019-01-31 12:30 ` Rainer Orth
2019-01-31 15:40   ` Bernd Edlinger
2019-01-31 16:51     ` Rainer Orth
2019-02-07 17:29 ` [PING] " Bernd Edlinger
2019-02-09 18:11 ` Bernd Edlinger
2019-02-09 18:18   ` Jakub Jelinek
2019-02-09 18:21     ` Bernd Edlinger
2019-02-16 12:58       ` Bernd Edlinger
2019-02-18 21:37         ` Johannes Pfau
2019-02-18 22:25         ` Iain Buclaw

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).