Removes references to bundled libuv. --- a/src/Makevars 2022-09-19 23:37:55.067810741 +0200 +++ b/src/Makevars 2022-09-19 23:39:20.984859770 +0200 @@ -5,7 +5,7 @@ UNAME := $(shell uname) -PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread +PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread ifeq ($(UNAME), Darwin) PKG_LIBS += -framework CoreServices @@ -23,7 +23,7 @@ PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS -PKG_CPPFLAGS = -Ilibuv/include -pthread +PKG_CPPFLAGS = -pthread # To avoid spurious warnings from `R CMD check --as-cran`, about compiler # warning flags like -Werror. @@ -43,50 +43,4 @@ # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS -$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o - -# We needed to rename lt~obsolete.m4 because the name causes problems with R -# CMD check. Here we rename it back. -libuv/m4/lt~obsolete.m4: libuv/m4/lt_obsolete.m4 - cp -p -f libuv/m4/lt_obsolete.m4 libuv/m4/lt~obsolete.m4 - -# Run ./configure to create the Makefile. -# -# On systems that do _not_ have automake installed, we need to make sure that -# configure does not try to run automake, because it will fail. To do that, we -# we need to touch various autotools-related files so it doesn't try to run -# autotools programs again. We also need to make sure configure is executable, -# because on some platforms, calling unzip() in R does not preserve the -# executable bit. -# -# If the system does have automake, then we'll run autogen.sh before configure, -# as per the official build instructions for libuv. autogen.sh will in turn run -# aclocal, autoconf, and automake. -# -# It's VERY IMPORTANT that mtime(aclocal.m4) <= mtime(configure), and also -# mtime(aclocal.m4) <= mtime(Makefile.in). On some platforms, passing multiple -# files to a single touch command gives them all the same time, but on others -# (Solaris and possibly some Fedoras) the timestamps are slightly increasing -# from one to the next, i.e. the order matters. To remove this fragility, we -# use "-r aclocal.m4" to ensure that all three files are guaranteed to have -# precisely the same timestamp value. -libuv/Makefile: libuv/m4/lt~obsolete.m4 - cd libuv; \ - if ! command -v automake >/dev/null 2>&1 ; then \ - echo "automake not found. Touching files so configure will not try to run automake."; \ - touch aclocal.m4; \ - touch -r aclocal.m4 configure Makefile.in; \ - else \ - echo "automake found. Running autoupdate and autogen.sh."; \ - autoupdate; \ - sh autogen.sh; \ - fi; \ - chmod +x configure; \ - CC="$(CC)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIGURE_FLAGS) - -libuv/.libs/libuv.a: libuv/Makefile - $(MAKE) --directory=libuv \ - HAVE_DTRACE=0 - -clean: - $(MAKE) --directory=libuv distclean +$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o gnu: patchutils: Update to 0.4.2....* gnu/packages/patchutils.scm (patchutils): Update to 0.4.2. [source]: Remove patch. [inputs]: Add ‘python’. [arguments]<#:phases>: Remove trailing #t. * gnu/local.mk (dist_patch_DATA): Remove patch. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Xinglu Chen 2021-09-17Merge branch 'master' into core-updates-frozen... Conflicts: gnu/packages/bioinformatics.scm gnu/packages/chez.scm gnu/packages/docbook.scm gnu/packages/ebook.scm gnu/packages/gnome.scm gnu/packages/linux.scm gnu/packages/networking.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/tex.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/dune.scm guix/build-system/go.scm guix/build-system/linux-module.scm guix/packages.scm Marius Bakke 2021-09-14gnu: meld: Copy GTKSourceView styles....This fixes a somewhat cryptic error, that pops up when gtksourceview-3 has not been installed or propagated by any other package. * gnu/packages/patchutils.scm (meld)[#:phases]: Add ‘copy-styles’. Liliana Marie Prikler 2021-09-07Merge branch 'master' into core-updates-frozenLudovic Courtès 2021-09-05gnu: meld: Update to 3.20.4....* gnu/packages/patchutils.scm (meld): Update to 3.20.4. Tobias Geerinckx-Rice 2021-03-06Merge branch 'master' into core-updatesChristopher Baines 2021-03-04gnu: meld: Update to 3.20.3....* gnu/packages/patchutils.scm (meld): Update to 3.20.3. Tobias Geerinckx-Rice 2021-02-24gnu: patchwork: Update to 3.0.1....* gnu/packages/patchutils.scm (patchwork): Update to 3.0.1. Christopher Baines