[gcc-7] 19/354: - libphobos cross build fixes

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit a65313c6d87e69739d9954ca9155e228f4052d4e
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Nov 16 10:25:54 2016 +0000

     - libphobos cross build fixes
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9059 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/gdc-libphobos-build.diff | 13 +++++++------
 debian/patches/libphobos-zlib.diff      | 29 ++++++++++++++---------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index 4a7550a..1157175 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -894,17 +894,18 @@ Index: b/src/configure.ac
 ===================================================================
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -165,7 +165,8 @@ target_libraries="target-libgcc \
+@@ -165,7 +165,9 @@ target_libraries="target-libgcc \
  		target-libffi \
  		target-libobjc \
  		target-libada \
 -		target-libgo"
 +		target-libgo \
++		target-zlib \
 +		target-libphobos"
  
  # these tools are built using the target libraries, and are intended to
  # run only in the target environment
-@@ -1258,6 +1259,7 @@ if test "${build}" != "${host}" ; then
+@@ -1258,6 +1260,7 @@ if test "${build}" != "${host}" ; then
    CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
    GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
    GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
@@ -912,7 +913,7 @@ Index: b/src/configure.ac
    DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
    LD_FOR_BUILD=${LD_FOR_BUILD-ld}
    NM_FOR_BUILD=${NM_FOR_BUILD-nm}
-@@ -1271,6 +1273,7 @@ else
+@@ -1271,6 +1274,7 @@ else
    CXX_FOR_BUILD="\$(CXX)"
    GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
    GOC_FOR_BUILD="\$(GOC)"
@@ -920,7 +921,7 @@ Index: b/src/configure.ac
    DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
    LD_FOR_BUILD="\$(LD)"
    NM_FOR_BUILD="\$(NM)"
-@@ -3183,6 +3186,7 @@ AC_SUBST(CXX_FOR_BUILD)
+@@ -3183,6 +3187,7 @@ AC_SUBST(CXX_FOR_BUILD)
  AC_SUBST(DLLTOOL_FOR_BUILD)
  AC_SUBST(GFORTRAN_FOR_BUILD)
  AC_SUBST(GOC_FOR_BUILD)
@@ -928,7 +929,7 @@ Index: b/src/configure.ac
  AC_SUBST(LDFLAGS_FOR_BUILD)
  AC_SUBST(LD_FOR_BUILD)
  AC_SUBST(NM_FOR_BUILD)
-@@ -3292,6 +3296,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TA
+@@ -3292,6 +3297,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TA
  NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
  NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
  NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo)
@@ -936,7 +937,7 @@ Index: b/src/configure.ac
  
  ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
  ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
-@@ -3325,6 +3330,8 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_T
+@@ -3325,6 +3331,8 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_T
  		[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
  GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC,
  		[gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/], go)
diff --git a/debian/patches/libphobos-zlib.diff b/debian/patches/libphobos-zlib.diff
index 924e255..4f1bd7f 100644
--- a/debian/patches/libphobos-zlib.diff
+++ b/debian/patches/libphobos-zlib.diff
@@ -1,18 +1,10 @@
 # DP: Build zlib in any case to have a fall back for missing libz multilibs
 
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -246,7 +246,6 @@
- # Make sure we don't let ZLIB be added if we didn't want it.
- if test x$with_system_zlib = xyes ; then
-   use_included_zlib=no
--  noconfigdirs="$noconfigdirs zlib"
- fi
- 
- # some tools are so dependent upon X11 that if we're not building with X, 
+Index: b/src/libphobos/configure.ac
+===================================================================
 --- a/src/libphobos/configure.ac
 +++ b/src/libphobos/configure.ac
-@@ -92,6 +92,7 @@
+@@ -91,6 +91,7 @@ DRUNTIME_OS_THREAD_MODEL
  DRUNTIME_OS_ARM_EABI_UNWINDER
  DRUNTIME_OS_MINFO_BRACKETING
  DRUNTIME_LIBRARIES_THREAD
@@ -20,15 +12,22 @@
  DRUNTIME_LIBRARIES_ZLIB
  DRUNTIME_LIBBACKTRACE_SETUP
  DRUNTIME_INSTALL_DIRECTORIES
+Index: b/src/libphobos/m4/druntime/libraries.m4
+===================================================================
 --- a/src/libphobos/m4/druntime/libraries.m4
 +++ b/src/libphobos/m4/druntime/libraries.m4
-@@ -28,5 +28,9 @@
+@@ -28,5 +28,14 @@ AC_DEFUN([DRUNTIME_LIBRARIES_ZLIB],
      AS_HELP_STRING([--with-system-zlib],
                     [use installed libz (default: no)]),
      [system_zlib=yes],[system_zlib=no])
-+  dnl the system zlib might not be available for all multilibs
-+  if test $system_zlib = yes; then
-+    AC_CHECK_LIB([z],[gzopen],[:],[system_zlib=no])
++  dnl no system zlib for cross builds
++  if test x$cross_compiling = xyes; then
++    system_zlib=no
++  else
++    dnl the system zlib might not be available for all multilibs
++    if test x$system_zlib = xyes; then
++      AC_CHECK_LIB([z],[gzopen],[:],[system_zlib=no])
++    fi
 +  fi
    AM_CONDITIONAL([DRUNTIME_ZLIB_SYSTEM], [test "$system_zlib" = yes])
  ])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git