gcc: install also with netbsd install(1) by creating the directory first

[Maya Rashish <maya%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Fri Jan 25 01:50:28 2019 +0200
Changeset:	4d56e35d06713df1bd1a997cc3a2f2933c3115fc

Modified Files:
	gcc9snapshot/distinfo
Added Files:
	gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.am
	gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.in
	gcc9snapshot/patches/patch-libphobos_src_Makefile.am
	gcc9snapshot/patches/patch-libphobos_src_Makefile.in

Log Message:
gcc: install also with netbsd install(1) by creating the directory first

this can't be with the shell equivalent of ${file:H} because we have
a file without /, too. so use dirname.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4d56e35d06713df1bd1a997cc3a2f2933c3115fc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc9snapshot/distinfo                              |  4 +++
 .../patch-libphobos_libdruntime_Makefile.am        | 22 ++++++++++++
 .../patch-libphobos_libdruntime_Makefile.in        | 39 ++++++++++++++++++++++
 .../patches/patch-libphobos_src_Makefile.am        | 22 ++++++++++++
 .../patches/patch-libphobos_src_Makefile.in        | 30 +++++++++++++++++
 5 files changed, 117 insertions(+)

diffs:
diff --git a/gcc9snapshot/distinfo b/gcc9snapshot/distinfo
index 5ecb621f63..e2d9851514 100644
--- a/gcc9snapshot/distinfo
+++ b/gcc9snapshot/distinfo
@@ -28,9 +28,13 @@ SHA1 (patch-libgcc_config.host) = bdd4cd27249c8b62793204428d95c977d58f06fb
 SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
 SHA1 (patch-libphobos_configure.tgt) = 7827878e76dc7014a6d470432e8f9807a7db568e
+SHA1 (patch-libphobos_libdruntime_Makefile.am) = 5330c13cf6d670a98e890ab006bb38239cff6a32
+SHA1 (patch-libphobos_libdruntime_Makefile.in) = 71628db1bf13087baa02056890ff251c338148ac
 SHA1 (patch-libphobos_libdruntime_core_stdc_assert__.d) = 5ba87194c78d2573269b90cfd62605de9b9dee8c
 SHA1 (patch-libphobos_libdruntime_core_stdc_wchar_.d) = 3ef87a04e90a6b33484dcadb7b2efbf075269a20
 SHA1 (patch-libphobos_libdruntime_core_sys_netbsd_dlfcn.d) = fb2760fc27d4c95af10ce0c9f7666badc6f8a770
 SHA1 (patch-libphobos_libdruntime_core_sys_netbsd_execinfo.d) = b4608d535788698ef51c0bb7aaf31a329b78c63e
+SHA1 (patch-libphobos_src_Makefile.am) = b3d4e04a143595305d27ca1549048714a9630a20
+SHA1 (patch-libphobos_src_Makefile.in) = a21da4cfab16c3de9a67944d9b46268d59406d4b
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 1b907114f8b3477400fabc7b84ca5c16cd9c2930
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = d498ce411dfcd57652f87957778fab66dd4ab9a0
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.am b/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.am
new file mode 100644
index 0000000000..2bf33dc376
--- /dev/null
+++ b/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Create directories, because BSD install(1) -D doesn't create directories
+
+--- libphobos/libdruntime/Makefile.am.orig	2019-01-01 12:31:55.000000000 +0000
++++ libphobos/libdruntime/Makefile.am
+@@ -140,10 +140,13 @@ clean-local:
+ # Handles generated files as well
+ install-data-local:
+ 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
++	  dirname=$$(dirname $$file) ; \
+ 	  if test -f $$file; then \
+-	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  else \
+-	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $(srcdir)/$$file \
+ 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  fi ; \
+ 	done
diff --git a/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.in b/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.in
new file mode 100644
index 0000000000..9b0b2faf19
--- /dev/null
+++ b/gcc9snapshot/patches/patch-libphobos_libdruntime_Makefile.in
@@ -0,0 +1,39 @@
+$NetBSD$
+
+Regen for Makefile.am
+
+--- libphobos/libdruntime/Makefile.in.orig	2018-11-28 17:54:07.000000000 +0000
++++ libphobos/libdruntime/Makefile.in
+@@ -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 @@ phobos_compiler_shared_flag = @phobos_co
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+-runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -2171,10 +2170,13 @@ clean-local:
+ # Handles generated files as well
+ install-data-local:
+ 	for file in $(ALL_DRUNTIME_INSTALL_DSOURCES); do \
++	  dirname=$$(dirname $$file) ; \
+ 	  if test -f $$file; then \
+-	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  else \
+-	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $(srcdir)/$$file \
+ 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  fi ; \
+ 	done
diff --git a/gcc9snapshot/patches/patch-libphobos_src_Makefile.am b/gcc9snapshot/patches/patch-libphobos_src_Makefile.am
new file mode 100644
index 0000000000..e998c0a670
--- /dev/null
+++ b/gcc9snapshot/patches/patch-libphobos_src_Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Create directories, because BSD install(1) -D doesn't create directories
+
+--- libphobos/src/Makefile.am.orig	2019-01-01 12:31:55.000000000 +0000
++++ libphobos/src/Makefile.am
+@@ -93,10 +93,13 @@ clean-local:
+ # Handles generated files as well
+ install-data-local:
+ 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
++	  dirname=$$(dirname $$file) ; \
+ 	  if test -f $$file; then \
+-	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  else \
+-	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $(srcdir)/$$file \
+ 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  fi ; \
+ 	done
diff --git a/gcc9snapshot/patches/patch-libphobos_src_Makefile.in b/gcc9snapshot/patches/patch-libphobos_src_Makefile.in
new file mode 100644
index 0000000000..302f622ca6
--- /dev/null
+++ b/gcc9snapshot/patches/patch-libphobos_src_Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Regen for Makefile.am
+
+--- libphobos/src/Makefile.in.orig	2019-01-20 22:33:18.000000000 +0000
++++ libphobos/src/Makefile.in
+@@ -610,7 +610,6 @@ phobos_compiler_shared_flag = @phobos_co
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+-runstatedir = @runstatedir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -1648,10 +1647,13 @@ clean-local:
+ # Handles generated files as well
+ install-data-local:
+ 	for file in $(ALL_PHOBOS_INSTALL_DSOURCES); do \
++	  dirname=$$(dirname $$file) ; \
+ 	  if test -f $$file; then \
+-	    $(INSTALL_HEADER) -D $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $$file $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  else \
+-	    $(INSTALL_HEADER) -D $(srcdir)/$$file \
++	    $(MKDIR_P) $(DESTDIR)$(gdc_include_dir)/$$dirname ; \
++	    $(INSTALL_HEADER) $(srcdir)/$$file \
+ 	      $(DESTDIR)$(gdc_include_dir)/$$file ; \
+ 	  fi ; \
+ 	done