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 \ 221e2bc2f981c9c5026d&showmsg=1'>Expand)Author 2021-06-28gnu: Add gccgo-10....Generate gccgo with MAKE-GCCGO to factorize phases, and to fix the cyclic dependency between out and lib (caused by libgo embedding the gotools path) that was worked around in <https://issues.guix.gnu.org/18101>. * gnu/packages/gcc.scm (custom-gcc-gccgo): New procedure. (make-gccgo): New procedure. (gccgo-10): New variable. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> Sarah Morgensen 2021-06-14gnu: gcc-8: Make static libs reproducible...This fixes the nonreproducibility in gcc documented here: https://reproducible-builds.org/docs/archives/#gnu-libtool * gnu/packages/patches/gcc-8-sort-libtool-find-output.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gcc.scm (gcc-8)[source]: Apply it. Carl Dong 2021-06-01gnu: gcc-9: Update to 9.4.0....* gnu/packages/gcc.scm (gcc-9): Update to 9.4.0. Efraim Flashner 2021-05-15gnu: gcc-8: Update to 8.5.0....* gnu/packages/gcc.scm (gcc-8): Update to 8.5.0. Efraim Flashner 2021-04-27gnu: Add gdc-11....* gnu/packages/gcc.scm (gdc-11): New variable. Efraim Flashner 2021-04-27gnu: Add gcc-toolchain-11....* gnu/packages/gcc.scm (gcc-11): New variable. * gnu/packages/commencement.scm (gcc-toolchain-11): New variable. Efraim Flashner 2021-04-09gnu: gcc-10: Update to 10.3.0....* gnu/packages/gcc.scm (gcc-10): Update to 10.3.0. Efraim Flashner 2021-03-25gnu: gcc: Fix comment about gfortran....Added by: cb4805e34c9997edca14743516b9a0fde6303d1c Fixes: 0681f05486d901c92637c098bb7afddef35068b0 * gnu/packages/gcc.scm (gcc): Fix comment about gfortran. Signed-off-by: Christopher Baines <mail@cbaines.net> Vincent Legoll 2021-03-23gnu: gcc-4.7: On powerpc64le, fix /lib64 references....Fixes: <https://bugs.gnu.org/46253>. * gnu/packages/gcc.scm (gcc-4.7)[#:phases][pre-configure]: When the gcc/config/rs6000 directory exists, replace "/lib64" with "/lib" in all files within it. Note that this fix will be picked up by any package that re-uses the pre-configure phase from gcc-4.7 (e.g., all the usual gcc packages). (make-libstdc++)[#:phases][fix-rs6000-libdir]: New phase, which does the same as above. It was necessary to duplicate the fix here because make-libstdc++ does not re-use the pre-configure phase from gcc-4.7. Chris Marusich