summaryrefslogtreecommitdiff
path: root/debian/patches/gdc-base-version.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2017-05-13 13:54:49 +0300
committerIgor Pashev <pashev.igor@gmail.com>2017-05-13 13:54:49 +0300
commit42156b5190f4fa150e1fab6777eb81e69d4db8c9 (patch)
tree3bf47de81cf1f89892789535a036d2d55d93a136 /debian/patches/gdc-base-version.diff
downloadgcc-6-debian.tar.gz
Imported gcc-6 (6.3.0-17)debian/6.3.0-17debian
Diffstat (limited to 'debian/patches/gdc-base-version.diff')
-rw-r--r--debian/patches/gdc-base-version.diff27
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/gdc-base-version.diff b/debian/patches/gdc-base-version.diff
new file mode 100644
index 0000000..6bf18e9
--- /dev/null
+++ b/debian/patches/gdc-base-version.diff
@@ -0,0 +1,27 @@
+# DP: Use the GCC base version for the D include dir name
+
+Index: b/src/libphobos/m4/druntime.m4
+===================================================================
+--- a/src/libphobos/m4/druntime.m4
++++ b/src/libphobos/m4/druntime.m4
+@@ -43,7 +43,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
+ AC_REQUIRE([AC_PROG_GDC])
+
+ AC_MSG_CHECKING([D GCC version])
+- d_gcc_ver=`$GDC -dumpversion`
++ d_gcc_ver=`$GDC -dumpversion | sed 's/^\(@<:@0-9@:>@*\).*/\1/'`
+ AC_MSG_RESULT($d_gcc_ver)
+ AC_ARG_WITH([cross-host],
+ AC_HELP_STRING([--with-cross-host=HOST],
+Index: b/src/libphobos/configure.ac
+===================================================================
+--- a/src/libphobos/configure.ac
++++ b/src/libphobos/configure.ac
+@@ -53,6 +53,7 @@ m4_rename([_AC_ARG_VAR_PRECIOUS],[glibd_
+ m4_define([_AC_ARG_VAR_PRECIOUS],[])
+ AM_PROG_AS
+ AC_PROG_CC
++dnl dummy change to run autoreconf in this directory
+ AC_PROG_GDC
+ WITH_LOCAL_DRUNTIME([GDC_CHECK_COMPILE], [])
+