Don't build/install/use bundled gctp code/headers. * cproj.h, proj.h: part of GCTP, therefore already present. * HE5_config.h, tutils.h: used for library building and testing. diff --git a/Makefile.in b/Makefile.in index f160d0d..367b537 100644 --- a/Makefile.in +++ b/Makefile.in @@ -206,7 +206,7 @@ LIBGCTP = $(top_builddir)/gctp/src/libGctp.la @TESTDRIVERS_CONDITIONAL_TRUE@TESTDRIVERS = testdrivers @INSTALL_INCLUDE_CONDITIONAL_FALSE@INCLUDE = @INSTALL_INCLUDE_CONDITIONAL_TRUE@INCLUDE = include -SUBDIRS = gctp src $(INCLUDE) samples $(TESTDRIVERS) +SUBDIRS = src $(INCLUDE) samples $(TESTDRIVERS) all: all-recursive .SUFFIXES: diff --git a/samples/Makefile.in b/samples/Makefile.in index 59331dd..64fda89 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -206,7 +206,6 @@ he5_gd_datainfo_SOURCES = he5_gd_datainfo.c he5_gd_datainfo_OBJECTS = he5_gd_datainfo.$(OBJEXT) he5_gd_datainfo_LDADD = $(LDADD) am__DEPENDENCIES_1 = $(top_builddir)/src/libhe5_hdfeos.la -am__DEPENDENCIES_2 = $(top_builddir)/gctp/src/libGctp.la he5_gd_datainfo_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) he5_gd_defexternalfld_SOURCES = he5_gd_defexternalfld.c @@ -1093,7 +1092,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ LIBHDFEOS5 = $(top_builddir)/src/libhe5_hdfeos.la -LIBGCTP = $(top_builddir)/gctp/src/libGctp.la +LIBGCTP = # Boilerplate definitions file diff --git a/include/Makefile.in b/include/Makefile.in index a572128..64dabb5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -190,8 +190,7 @@ LIBGCTP = $(top_builddir)/gctp/src/libGctp.la # Boilerplate include # Headers to install -include_HEADERS = HE5_GctpFunc.h HE5_HdfEosDef.h HE5_config.h cproj.h ease.h \ - isin.h proj.h tutils.h cfortHdf.h +include_HEADERS = HE5_GctpFunc.h HE5_HdfEosDef.h ease.h isin.h cfortHdf.h all: HE5_config.h $(MAKE) $(AM_MAKEFLAGS) all-am -- 2.10.0 ix/log/?id=e00ca95e08bc1cc2cb39f3178485ef16defce0be'>root/m4/guix.m4
AgeCommit message (Expand)Author
2024-12-03gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd....On commit: ec8a5ec15f898e864705e5a5c834532e3fa8d0a4 gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/ With guix hash -r: 15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for x86_64-gnu. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu. * guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu. (%cuirass-supported-systems): Remove x86_64-gnu. * guix/utils.scm (target-64bit?): Add x86_64-gnu. * m4/guix.m4: Add x86_64-gnu as a supported system. * doc/guix.texi (GNU Distribution): Add x86_64-gnu. Change-Id: I828159aedb3f66caba98e935083cc3682429f219 Janneke Nieuwenhuizen