From: Iain Buclaw Date: Fri, 12 Apr 2019 20:13:34 +0000 (+0000) Subject: libphobos: Add target-zlib to top-level configure X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bb50312e027994bb5260163a9c021b5444f86257;p=gcc.git libphobos: Add target-zlib to top-level configure Removes the building of zlib from within libphobos, using instead the libz_convenience.a library. ChangeLog: 2019-04-12 Iain Buclaw * configure.ac: Add target-zlib to target_libraries. * configure: Regenerate. gcc/ChangeLog: 2019-04-12 Iain Buclaw * doc/install.texi: Document --with-target-system-zlib. libphobos/ChangeLog: 2019-04-12 Iain Buclaw * m4/druntime/libraries.m4 (DRUNTIME_LIBRARIES_ZLIB): Use libz_convenience.a if not using system zlib. * Makefile.in: Regenerate. * configure: Regenerate. * libdruntime/Makefile.in: Regenerate. * src/Makefile.am: Remove ZLIB_CSOURCES and AM_CFLAGS. * src/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r270328 --- diff --git a/ChangeLog b/ChangeLog index aa85a16d180..4622118b252 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-04-12 Iain Buclaw + + * configure.ac: Add target-zlib to target_libraries. + * configure: Regenerate. + 2019-04-09 Martin Liska * Makefile.in: Regenerate. diff --git a/configure b/configure index adf4fda0f69..1c5f9b502a8 100755 --- a/configure +++ b/configure @@ -2813,7 +2813,8 @@ target_libraries="target-libgcc \ target-libobjc \ target-libada \ target-libgo \ - target-libphobos" + target-libphobos \ + target-zlib" # these tools are built using the target libraries, and are intended to # run only in the target environment diff --git a/configure.ac b/configure.ac index 87f2aee0500..cffccd37805 100644 --- a/configure.ac +++ b/configure.ac @@ -163,7 +163,8 @@ target_libraries="target-libgcc \ target-libobjc \ target-libada \ target-libgo \ - target-libphobos" + target-libphobos \ + target-zlib" # these tools are built using the target libraries, and are intended to # run only in the target environment diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 907c6f38c05..83e595453be 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2019-04-12 Iain Buclaw + + * doc/install.texi: Document --with-target-system-zlib. + 2019-04-12 Martin Sebor PR c/88383 diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 3f0c421c599..911875f9578 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -2344,6 +2344,18 @@ If none of these options are specified, the library is assumed in default locations. @end table +@subheading D-Specific Options + +The following options apply to the build of the D runtime library. + +@table @code +@item --with-target-system-zlib +Use installed @samp{zlib} rather than that included with GCC@. This needs +to be available for each multilib variant, unless configured with +@option{--with-target-system-zlib=@samp{auto}} in which case the GCC@ included +@samp{zlib} is only used when the system installed library is not available. +@end table + @html

diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog index e974a64299f..e79b69726c0 100644 --- a/libphobos/ChangeLog +++ b/libphobos/ChangeLog @@ -1,3 +1,14 @@ +2019-04-12 Iain Buclaw + + * m4/druntime/libraries.m4 (DRUNTIME_LIBRARIES_ZLIB): Use + libz_convenience.a if not using system zlib. + * Makefile.in: Regenerate. + * configure: Regenerate. + * libdruntime/Makefile.in: Regenerate. + * src/Makefile.am: Remove ZLIB_CSOURCES and AM_CFLAGS. + * src/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + 2019-04-12 Iain Buclaw * testsuite/Makefile.am: diff --git a/libphobos/Makefile.in b/libphobos/Makefile.in index e7c156aa5eb..1cd4117f2ee 100644 --- a/libphobos/Makefile.in +++ b/libphobos/Makefile.in @@ -241,6 +241,7 @@ LIBBACKTRACE = @LIBBACKTRACE@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBZ = @LIBZ@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/libphobos/configure b/libphobos/configure index f359a6c9e3b..ead96d11bb4 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -640,8 +640,7 @@ gdc_include_dir libphobos_toolexeclibdir libphobos_toolexecdir gcc_version -DRUNTIME_ZLIB_SYSTEM_FALSE -DRUNTIME_ZLIB_SYSTEM_TRUE +LIBZ BACKTRACE_SUPPORTS_THREADS BACKTRACE_USES_MALLOC BACKTRACE_SUPPORTED @@ -1480,7 +1479,7 @@ Optional Packages: --without-libatomic Do not use libatomic in core.atomic (default: auto) --without-libbacktrace Do not use libbacktrace in core.runtime (default: auto) - --with-target-system-zlib + --with-target-system-zlib={yes,no,auto} use installed libz (default: no) --with-cross-host=HOST configuring with a cross compiler @@ -11495,7 +11494,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11498 "configure" +#line 11497 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11601,7 +11600,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11604 "configure" +#line 11603 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14844,79 +14843,94 @@ $as_echo "$druntime_cv_lib_sockets" >&6; } LIBS="$LIBS $druntime_cv_lib_sockets" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + LIBZ="" + # Check whether --with-target-system-zlib was given. if test "${with_target_system_zlib+set}" = set; then : withval=$with_target_system_zlib; +else + with_target_system_zlib=no fi - system_zlib=false - if test "x$with_target_system_zlib" = "xyes"; then : + case "$with_target_system_zlib" in + yes|no|auto) ;; + *) as_fn_error $? "Invalid argument for --with-target-system-zlib" "$LINENO" 5 ;; + esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 -$as_echo_n "checking for deflate in -lz... " >&6; } -if ${ac_cv_lib_z_deflate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for system zlib" >&5 +$as_echo_n "checking for system zlib... " >&6; } + save_LIBS=$LIBS + LIBS="$LIBS -lz" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char deflate (); +#include int main () { -return deflate (); +gzopen("none", "rb") ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_z_deflate=yes -else - ac_cv_lib_z_deflate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 -$as_echo "$ac_cv_lib_z_deflate" >&6; } -if test "x$ac_cv_lib_z_deflate" = xyes; then : - system_zlib=yes + if test "$cross_compiling" = yes; then : + system_zlib_found=no else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - as_fn_error $? "System zlib not found" "$LINENO" 5 + #include + int main() { + gzFile file = gzopen("none", "rb"); + return 0; + } +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + system_zlib_found=yes +else + system_zlib_found=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi else - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5 -$as_echo_n "checking for zlib... " >&6; } + system_zlib_found=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$save_LIBS + + if test x$system_zlib_found = xyes && test x$with_target_system_zlib != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } + LIBS="$LIBS -lz" + elif test x$system_zlib_found = xno && test x$with_target_system_zlib = xyes; then + as_fn_error $? "system zlib required but not found" "$LINENO" 5 + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5 $as_echo "just compiled" >&6; } + LIBZ=../../zlib/libz_convenience.la + fi -fi - if test "$with_target_system_zlib" = yes; then - DRUNTIME_ZLIB_SYSTEM_TRUE= - DRUNTIME_ZLIB_SYSTEM_FALSE='#' -else - DRUNTIME_ZLIB_SYSTEM_TRUE='#' - DRUNTIME_ZLIB_SYSTEM_FALSE= -fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -15226,10 +15240,6 @@ if test -z "${DRUNTIME_OS_MINFO_BRACKETING_TRUE}" && test -z "${DRUNTIME_OS_MINF as_fn_error $? "conditional \"DRUNTIME_OS_MINFO_BRACKETING\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DRUNTIME_ZLIB_SYSTEM_TRUE}" && test -z "${DRUNTIME_ZLIB_SYSTEM_FALSE}"; then - as_fn_error $? "conditional \"DRUNTIME_ZLIB_SYSTEM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in index 2cf1d312ec7..fe95436c118 100644 --- a/libphobos/libdruntime/Makefile.in +++ b/libphobos/libdruntime/Makefile.in @@ -555,6 +555,7 @@ LIBBACKTRACE = @LIBBACKTRACE@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBZ = @LIBZ@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4 index 41c888066bc..6e81fd99e4b 100644 --- a/libphobos/m4/druntime/libraries.m4 +++ b/libphobos/m4/druntime/libraries.m4 @@ -79,28 +79,59 @@ AC_DEFUN([DRUNTIME_LIBRARIES_NET], # DRUNTIME_LIBRARIES_ZLIB # ----------------------- # Allow specifying whether to use the system zlib or -# compiling the zlib included in GCC. Define -# DRUNTIME_ZLIB_SYSTEM conditional and add zlib to -# LIBS if necessary. +# compiling the zlib included in GCC. Adds substitute +# for LIBZ or adds zlib to LIBS if necessary. AC_DEFUN([DRUNTIME_LIBRARIES_ZLIB], [ - AC_ARG_WITH(target-system-zlib, - AS_HELP_STRING([--with-target-system-zlib], - [use installed libz (default: no)])) + AC_LANG_PUSH([C]) + LIBZ="" - system_zlib=false - 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_CHECKING([for zlib]) + AC_ARG_WITH(target-system-zlib, + AS_HELP_STRING([--with-target-system-zlib={yes,no,auto}], + [use installed libz (default: no)]),, + [with_target_system_zlib=no]) + + case "$with_target_system_zlib" in + yes|no|auto) ;; + *) AC_MSG_ERROR([Invalid argument for --with-target-system-zlib]) ;; + esac + + AC_MSG_CHECKING([for system zlib]) + save_LIBS=$LIBS + LIBS="$LIBS -lz" + dnl the link test is not good enough for ARM32 multilib detection, + dnl first check to link, then to run + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include ],[gzopen("none", "rb")])], + [ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + int main() { + gzFile file = gzopen("none", "rb"); + return 0; + } + ]])], + [system_zlib_found=yes], + [system_zlib_found=no], + dnl no system zlib for cross builds ... + [system_zlib_found=no] + ) + ], + [system_zlib_found=no]) + LIBS=$save_LIBS + + if test x$system_zlib_found = xyes && test x$with_target_system_zlib != xno; then + AC_MSG_RESULT([found]) + LIBS="$LIBS -lz" + elif test x$system_zlib_found = xno && test x$with_target_system_zlib = xyes; then + AC_MSG_ERROR([system zlib required but not found]) + else AC_MSG_RESULT([just compiled]) - ]) + LIBZ=../../zlib/libz_convenience.la + fi - AM_CONDITIONAL([DRUNTIME_ZLIB_SYSTEM], [test "$with_target_system_zlib" = yes]) + AC_SUBST(LIBZ) + AC_LANG_POP([C]) ]) # DRUNTIME_LIBRARIES_ATOMIC diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am index ee595fa4542..04a8ad5e73b 100644 --- a/libphobos/src/Makefile.am +++ b/libphobos/src/Makefile.am @@ -22,9 +22,6 @@ include $(top_srcdir)/d_rules.am D_EXTRA_DFLAGS=-nostdinc -I $(srcdir) \ -I $(top_srcdir)/libdruntime -I ../libdruntime -I . -# C flags for zlib compilation -AM_CFLAGS=@DEFS@ -I. -I$(srcdir)/../libdruntime/gcc -I$(top_srcdir)/../zlib - # D flags for compilation AM_DFLAGS=$(phobos_compiler_pic_flag) @@ -37,19 +34,13 @@ ALL_PHOBOS_COMPILE_DSOURCES = $(PHOBOS_DSOURCES) ALL_PHOBOS_SOURCES = $(ALL_PHOBOS_COMPILE_DSOURCES) # Main library build definitions -if DRUNTIME_ZLIB_SYSTEM - ZLIB_SRC = -else - ZLIB_SRC = $(ZLIB_CSOURCES) -endif - toolexeclib_DATA = libgphobos.spec toolexeclib_LTLIBRARIES = libgphobos.la -libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) $(ZLIB_SRC) +libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) libgphobos_la_LIBTOOLFLAGS = libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \ -version-info $(libtool_VERSION) -libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la +libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la $(LIBZ) libgphobos_la_DEPENDENCIES = libgphobos.spec # Handles generated files as well @@ -64,16 +55,6 @@ install-data-local: fi ; \ done -# Zlib sources when not using system libz -ZLIB_CSOURCES=$(top_srcdir)/../zlib/adler32.c $(top_srcdir)/../zlib/compress.c \ - $(top_srcdir)/../zlib/crc32.c $(top_srcdir)/../zlib/deflate.c \ - $(top_srcdir)/../zlib/gzclose.c $(top_srcdir)/../zlib/gzlib.c \ - $(top_srcdir)/../zlib/gzread.c $(top_srcdir)/../zlib/gzwrite.c \ - $(top_srcdir)/../zlib/infback.c $(top_srcdir)/../zlib/inffast.c \ - $(top_srcdir)/../zlib/inflate.c $(top_srcdir)/../zlib/inftrees.c \ - $(top_srcdir)/../zlib/trees.c $(top_srcdir)/../zlib/uncompr.c \ - $(top_srcdir)/../zlib/zutil.c - # Source file definitions. Boring stuff, auto-generated with # https://gist.github.com/jpf91/8744acebc9dcf1e9d1a35cdff20afbb2 # Can't use wildcards here: diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in index 776db981f16..0cc16ce1cf0 100644 --- a/libphobos/src/Makefile.in +++ b/libphobos/src/Makefile.in @@ -142,6 +142,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \ "$(DESTDIR)$(toolexeclibdir)" LTLIBRARIES = $(toolexeclib_LTLIBRARIES) +am__DEPENDENCIES_1 = am__dirstamp = $(am__leading_dot)dirstamp am__objects_1 = etc/c/curl.lo etc/c/sqlite3.lo etc/c/zlib.lo \ std/algorithm/comparison.lo std/algorithm/internal.lo \ @@ -216,16 +217,7 @@ am__objects_1 = etc/c/curl.lo etc/c/sqlite3.lo etc/c/zlib.lo \ std/windows/syserror.lo std/xml.lo std/zip.lo std/zlib.lo am__objects_2 = $(am__objects_1) am__objects_3 = $(am__objects_2) -am__objects_4 = libgphobos_la-adler32.lo libgphobos_la-compress.lo \ - libgphobos_la-crc32.lo libgphobos_la-deflate.lo \ - libgphobos_la-gzclose.lo libgphobos_la-gzlib.lo \ - libgphobos_la-gzread.lo libgphobos_la-gzwrite.lo \ - libgphobos_la-infback.lo libgphobos_la-inffast.lo \ - libgphobos_la-inflate.lo libgphobos_la-inftrees.lo \ - libgphobos_la-trees.lo libgphobos_la-uncompr.lo \ - libgphobos_la-zutil.lo -@DRUNTIME_ZLIB_SYSTEM_FALSE@am__objects_5 = $(am__objects_4) -am_libgphobos_la_OBJECTS = $(am__objects_3) $(am__objects_5) +am_libgphobos_la_OBJECTS = $(am__objects_3) libgphobos_la_OBJECTS = $(am_libgphobos_la_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -242,27 +234,6 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = am__depfiles_maybe = -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = SOURCES = $(libgphobos_la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -341,6 +312,7 @@ LIBBACKTRACE = @LIBBACKTRACE@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBZ = @LIBZ@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -461,9 +433,6 @@ D_EXTRA_DFLAGS = -nostdinc -I $(srcdir) \ -I $(top_srcdir)/libdruntime -I ../libdruntime -I . -# C flags for zlib compilation -AM_CFLAGS = @DEFS@ -I. -I$(srcdir)/../libdruntime/gcc -I$(top_srcdir)/../zlib - # D flags for compilation AM_DFLAGS = $(phobos_compiler_pic_flag) @@ -473,31 +442,18 @@ ALL_PHOBOS_INSTALL_DSOURCES = $(PHOBOS_DSOURCES) # Setup source files depending on configure ALL_PHOBOS_COMPILE_DSOURCES = $(PHOBOS_DSOURCES) ALL_PHOBOS_SOURCES = $(ALL_PHOBOS_COMPILE_DSOURCES) -@DRUNTIME_ZLIB_SYSTEM_FALSE@ZLIB_SRC = $(ZLIB_CSOURCES) # Main library build definitions -@DRUNTIME_ZLIB_SYSTEM_TRUE@ZLIB_SRC = toolexeclib_DATA = libgphobos.spec toolexeclib_LTLIBRARIES = libgphobos.la -libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) $(ZLIB_SRC) +libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) libgphobos_la_LIBTOOLFLAGS = libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \ -version-info $(libtool_VERSION) -libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la +libgphobos_la_LIBADD = ../libdruntime/libgdruntime.la $(LIBZ) libgphobos_la_DEPENDENCIES = libgphobos.spec -# Zlib sources when not using system libz -ZLIB_CSOURCES = $(top_srcdir)/../zlib/adler32.c $(top_srcdir)/../zlib/compress.c \ - $(top_srcdir)/../zlib/crc32.c $(top_srcdir)/../zlib/deflate.c \ - $(top_srcdir)/../zlib/gzclose.c $(top_srcdir)/../zlib/gzlib.c \ - $(top_srcdir)/../zlib/gzread.c $(top_srcdir)/../zlib/gzwrite.c \ - $(top_srcdir)/../zlib/infback.c $(top_srcdir)/../zlib/inffast.c \ - $(top_srcdir)/../zlib/inflate.c $(top_srcdir)/../zlib/inftrees.c \ - $(top_srcdir)/../zlib/trees.c $(top_srcdir)/../zlib/uncompr.c \ - $(top_srcdir)/../zlib/zutil.c - - # Source file definitions. Boring stuff, auto-generated with # https://gist.github.com/jpf91/8744acebc9dcf1e9d1a35cdff20afbb2 # Can't use wildcards here: @@ -568,7 +524,7 @@ PHOBOS_DSOURCES = etc/c/curl.d etc/c/sqlite3.d etc/c/zlib.d \ all: all-am .SUFFIXES: -.SUFFIXES: .c .d .lo .o .obj +.SUFFIXES: .d .lo .o $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/d_rules.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -907,60 +863,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -.c.o: - $(AM_V_CC)$(COMPILE) -c -o $@ $< - -.c.obj: - $(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: - $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< - -libgphobos_la-adler32.lo: $(top_srcdir)/../zlib/adler32.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-adler32.lo `test -f '$(top_srcdir)/../zlib/adler32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/adler32.c - -libgphobos_la-compress.lo: $(top_srcdir)/../zlib/compress.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-compress.lo `test -f '$(top_srcdir)/../zlib/compress.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/compress.c - -libgphobos_la-crc32.lo: $(top_srcdir)/../zlib/crc32.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-crc32.lo `test -f '$(top_srcdir)/../zlib/crc32.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/crc32.c - -libgphobos_la-deflate.lo: $(top_srcdir)/../zlib/deflate.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-deflate.lo `test -f '$(top_srcdir)/../zlib/deflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/deflate.c - -libgphobos_la-gzclose.lo: $(top_srcdir)/../zlib/gzclose.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-gzclose.lo `test -f '$(top_srcdir)/../zlib/gzclose.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzclose.c - -libgphobos_la-gzlib.lo: $(top_srcdir)/../zlib/gzlib.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-gzlib.lo `test -f '$(top_srcdir)/../zlib/gzlib.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzlib.c - -libgphobos_la-gzread.lo: $(top_srcdir)/../zlib/gzread.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-gzread.lo `test -f '$(top_srcdir)/../zlib/gzread.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzread.c - -libgphobos_la-gzwrite.lo: $(top_srcdir)/../zlib/gzwrite.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-gzwrite.lo `test -f '$(top_srcdir)/../zlib/gzwrite.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/gzwrite.c - -libgphobos_la-infback.lo: $(top_srcdir)/../zlib/infback.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-infback.lo `test -f '$(top_srcdir)/../zlib/infback.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/infback.c - -libgphobos_la-inffast.lo: $(top_srcdir)/../zlib/inffast.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-inffast.lo `test -f '$(top_srcdir)/../zlib/inffast.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inffast.c - -libgphobos_la-inflate.lo: $(top_srcdir)/../zlib/inflate.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-inflate.lo `test -f '$(top_srcdir)/../zlib/inflate.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inflate.c - -libgphobos_la-inftrees.lo: $(top_srcdir)/../zlib/inftrees.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-inftrees.lo `test -f '$(top_srcdir)/../zlib/inftrees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/inftrees.c - -libgphobos_la-trees.lo: $(top_srcdir)/../zlib/trees.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-trees.lo `test -f '$(top_srcdir)/../zlib/trees.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/trees.c - -libgphobos_la-uncompr.lo: $(top_srcdir)/../zlib/uncompr.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-uncompr.lo `test -f '$(top_srcdir)/../zlib/uncompr.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/uncompr.c - -libgphobos_la-zutil.lo: $(top_srcdir)/../zlib/zutil.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgphobos_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgphobos_la-zutil.lo `test -f '$(top_srcdir)/../zlib/zutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../zlib/zutil.c - mostlyclean-libtool: -rm -f *.lo diff --git a/libphobos/testsuite/Makefile.in b/libphobos/testsuite/Makefile.in index b81209b9251..9c509f37729 100644 --- a/libphobos/testsuite/Makefile.in +++ b/libphobos/testsuite/Makefile.in @@ -185,6 +185,7 @@ LIBBACKTRACE = @LIBBACKTRACE@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIBZ = @LIBZ@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@