Remove dependencies on bundled zlib, pcre and expat. diff --git a/Makefile.in b/Makefile.in index 4360a26..80f9f59 100644 --- a/Makefile.in +++ b/Makefile.in @@ -210,8 +210,7 @@ coda_matlab_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @BUILD_MATLAB_TRUE@@SUBPACKAGE_MODE_FALSE@ -rpath \ @BUILD_MATLAB_TRUE@@SUBPACKAGE_MODE_FALSE@ $(matlabmexexecdir) am__DEPENDENCIES_1 = -libcoda_la_DEPENDENCIES = @LTLIBOBJS@ libexpat_internal.la \ - libpcre_internal.la libz_internal.la $(am__DEPENDENCIES_1) \ +libcoda_la_DEPENDENCIES = @LTLIBOBJS@ $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am__libcoda_la_SOURCES_DIST = libcoda/coda-ascbin-cursor.c \ libcoda/coda-ascbin.h libcoda/coda-ascii-cursor.c \ @@ -306,8 +305,7 @@ libcoda_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libcoda_la_LDFLAGS) $(LDFLAGS) -o $@ @SUBPACKAGE_MODE_FALSE@am_libcoda_la_rpath = -rpath $(libdir) -am__DEPENDENCIES_2 = @LTLIBOBJS@ libexpat_internal.la \ - libpcre_internal.la libz_internal.la $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_2 = @LTLIBOBJS@ $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libcoda_internal_la_DEPENDENCIES = $(am__DEPENDENCIES_2) am__libcoda_internal_la_SOURCES_DIST = libcoda/coda-ascbin-cursor.c \ @@ -898,8 +896,8 @@ INSTALL_DATA_HOOK_TARGETS = $(am__append_1) UNINSTALL_HOOK_TARGETS = CLEAN_LOCAL_TARGETS = $(am__append_11) ALL_LOCAL_TARGETS = -@SUBPACKAGE_MODE_FALSE@noinst_LTLIBRARIES = libcoda_internal.la libexpat_internal.la libpcre_internal.la libz_internal.la -@SUBPACKAGE_MODE_TRUE@noinst_LTLIBRARIES = libcoda_internal.la libexpat_internal.la libpcre_internal.la libz_internal.la +@SUBPACKAGE_MODE_FALSE@noinst_LTLIBRARIES = libcoda_internal.la +@SUBPACKAGE_MODE_TRUE@noinst_LTLIBRARIES = libcoda_internal.la # libraries (+ related files) @SUBPACKAGE_MODE_FALSE@lib_LTLIBRARIES = libcoda.la @@ -1048,7 +1046,7 @@ libcoda_hdf5_files = \ libcoda_la_CPPFLAGS = -Ilibcoda/expat -I$(srcdir)/libcoda/expat -Ilibcoda/pcre -I$(srcdir)/libcoda/pcre -Ilibcoda/zlib -I$(srcdir)/libcoda/zlib $(AM_CPPFLAGS) libcoda_la_LDFLAGS = -no-undefined -version-info $(LIBCODA_CURRENT):$(LIBCODA_REVISION):$(LIBCODA_AGE) -libcoda_la_LIBADD = @LTLIBOBJS@ libexpat_internal.la libpcre_internal.la libz_internal.la $(HDF4LIBS) $(HDF5LIBS) +libcoda_la_LIBADD = @LTLIBOBJS@ $(HDF4LIBS) $(HDF5LIBS) libcoda_internal_la_SOURCES = libcoda/coda-ascbin-cursor.c \ libcoda/coda-ascbin.h libcoda/coda-ascii-cursor.c \ libcoda/coda-ascii-internal.h libcoda/coda-ascii.c \ 82acdfc7e518b09603e7e64ddfc4e87262497'>Collapse)Author 2023-12-22gexp: #:references-graphs accepts and honors <gexp-input> records.Ludovic Courtès * guix/gexp.scm (lower-reference-graphs)[tuple->gexp-input]: Add ‘gexp-input?’ case. (gexp->derivation): Update docstring. * doc/guix.texi (G-Expressions): Adjust accordingly. * tests/gexp.scm ("references-file, non-default output"): New test. Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I595cb75da0867ab8ab44552887dc06ed1d23315e 2023-12-22gexp: Add compiler for <gexp-input>.Ludovic Courtès * guix/gexp.scm (gexp-input-compiler): New procedure. * tests/gexp.scm ("gexp references non-existent output") ("gexp-input, as first-class input"): New tests. * doc/guix.texi (G-Expressions): Document it. Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I95b58d6e4d77a54364026b4324fbb00125a9402e 2023-11-25tests: Import (guix build syscalls) when (guix build store-copy) is used.Ludovic Courtès Fixes a test failure introduced in 189525412e3d803f3f77e15ec4a62aaa57f65a2d. * guix/progress.scm: Autoload (guix build syscalls). * tests/gexp.scm ("gexp->derivation, store copy"): Add (guix build syscalls) to the list of imported modules. Use ‘with-imported-modules’ rather than #:modules. Change-Id: I8d3fe90f564ef4b1a340f34cee6c08a741f7b836 2022-11-11grafts: Run with a UTF-8 locale.Ludovic Courtès Fixes <https://issues.guix.gnu.org/55968>. Reported by Maxime Devos <maximedevos@telenet.be>. * guix/grafts.scm (%graft-with-utf8-locale?): New parameter. (graft-derivation/shallow)[glibc-locales, set-utf8-locale]: New variables. [build]: Use 'set-utf8-locale'. * tests/gexp.scm, tests/grafts.scm, tests/packages.scm: Set '%graft-with-utf8-locale?' to #f.