diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-11-18 15:53:29 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-11-18 15:53:29 +0300 |
| commit | 8f6c4b0033c72f8ac14694c419a99458339dd6a9 (patch) | |
| tree | 06c106e622a58100aa85a381b9b65d222b076df4 /debian/patches/libphobos-zlib.diff | |
| parent | 42156b5190f4fa150e1fab6777eb81e69d4db8c9 (diff) | |
| download | gcc-9-debian.tar.gz | |
Import gcc-9 (9.2.1-19)debian/9.2.1-19debian
Diffstat (limited to 'debian/patches/libphobos-zlib.diff')
| -rw-r--r-- | debian/patches/libphobos-zlib.diff | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/debian/patches/libphobos-zlib.diff b/debian/patches/libphobos-zlib.diff index 1aa8282..ddf7c95 100644 --- a/debian/patches/libphobos-zlib.diff +++ b/debian/patches/libphobos-zlib.diff @@ -1,22 +1,18 @@ # DP: Build zlib in any case to have a fall back for missing libz multilibs -Index: b/src/libphobos/configure.ac -=================================================================== --- a/src/libphobos/configure.ac +++ b/src/libphobos/configure.ac -@@ -104,6 +104,7 @@ WITH_LOCAL_DRUNTIME([ - - DRUNTIME_LIBBACKTRACE_SETUP +@@ -142,6 +142,7 @@ DRUNTIME_LIBRARIES_BACKTRACE + DRUNTIME_LIBRARIES_DLOPEN + DRUNTIME_LIBRARIES_ZLIB DRUNTIME_INSTALL_DIRECTORIES +dnl fake change to regenerate the configure file # Add dependencies for libgphobos.spec file - LIBS="$LIBS $LIBADD_DLOPEN" -Index: b/src/libphobos/m4/druntime/libraries.m4 -=================================================================== + SPEC_PHOBOS_DEPS="$LIBS" --- a/src/libphobos/m4/druntime/libraries.m4 +++ b/src/libphobos/m4/druntime/libraries.m4 -@@ -39,18 +39,44 @@ AC_DEFUN([DRUNTIME_LIBRARIES_ZLIB], +@@ -52,19 +52,45 @@ AC_DEFUN([DRUNTIME_LIBRARIES_ZLIB], [ AC_ARG_WITH(target-system-zlib, AS_HELP_STRING([--with-target-system-zlib], @@ -28,8 +24,9 @@ Index: b/src/libphobos/m4/druntime/libraries.m4 - AS_IF([test "x$with_target_system_zlib" = "xyes"], [ - AC_CHECK_LIB([z], [deflate], [ - system_zlib=yes -- ], [ -- AC_MSG_ERROR([System zlib not found])]) +- ], [ +- AC_MSG_ERROR([System zlib not found]) +- ]) - ], [ - AC_MSG_CHECKING([for zlib]) - AC_MSG_RESULT([just compiled]) @@ -57,15 +54,16 @@ Index: b/src/libphobos/m4/druntime/libraries.m4 + ) + ], + [system_zlib_found=no]) -+ LIBS=$save_LIBS + if test x$system_zlib = xyes; then + if test x$system_zlib_found = xyes; then + AC_MSG_RESULT([found]) + else ++ LIBS=$save_LIBS + AC_MSG_RESULT([not found, disabled]) + system_zlib=no + fi + else ++ LIBS=$save_LIBS + AC_MSG_RESULT([not enabled]) + fi + AC_LANG_POP |