From 63b59cb35d0fb09d03178c007bcbf24da0d0b322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Sun, 27 Oct 2024 14:25:22 +0100 Subject: [PATCH] Avoid running autotools at install time Depending on the timestamps in the git checkout or the built package, `make` might trigger an `autoconf`, `automake` or `aclocal` re-run when configuring libuv. Now we set up the timestamps in the correct order, so such re-run does not happen --- .github/workflows/dragonflybsd.yaml | 2 +- .github/workflows/freebsd.yaml | 4 +--- .github/workflows/netbsd.yaml | 2 +- .github/workflows/openbsd.yaml | 3 +-- src/Makevars | 3 +++ 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dragonflybsd.yaml b/.github/workflows/dragonflybsd.yaml index 1ea731c9..ab88afe6 100644 --- a/.github/workflows/dragonflybsd.yaml +++ b/.github/workflows/dragonflybsd.yaml @@ -37,7 +37,7 @@ jobs: - name: Install system requirements run: | - pkg install -y autoconf automake libtool hs-pandoc + pkg install -y hs-pandoc shell: dragonflybsd {0} - uses: r-lib/actions/setup-r-dependencies@v2 diff --git a/.github/workflows/freebsd.yaml b/.github/workflows/freebsd.yaml index 4e6031c2..18cba739 100644 --- a/.github/workflows/freebsd.yaml +++ b/.github/workflows/freebsd.yaml @@ -42,9 +42,7 @@ jobs: - name: Install system requirements run: | - pkg install -y hs-pandoc autoconf automake libtool - ln -s aclocal /usr/local/bin/aclocal-1.16 - ln -s automake /usr/local/bin/automake-1.16 + pkg install -y hs-pandoc shell: freebsd {0} - uses: r-lib/actions/setup-r-dependencies@v2 diff --git a/.github/workflows/netbsd.yaml b/.github/workflows/netbsd.yaml index e70be420..a55c9314 100644 --- a/.github/workflows/netbsd.yaml +++ b/.github/workflows/netbsd.yaml @@ -38,7 +38,7 @@ jobs: - name: Install system dependencies shell: netbsd {0} run: | - pkg_add autoconf automake libtool pandoc png + pkg_add pandoc png # these do not work in the end, but I'll leave them here ln -s libpng16.so /usr/pkg/lib/libpng.so ln -s libfontconfig.so /usr/pkg/lib/libfontconfig.so.2 diff --git a/.github/workflows/openbsd.yaml b/.github/workflows/openbsd.yaml index e3689920..77e4df22 100644 --- a/.github/workflows/openbsd.yaml +++ b/.github/workflows/openbsd.yaml @@ -45,8 +45,7 @@ jobs: - name: Install system dependencies run: | - pkg_add -I pandoc automake-1.16.5 libtool - echo 'export AUTOCONF_VERSION=2.69' >> /etc/profile + pkg_add -I pandoc shell: openbsd {0} - uses: r-lib/actions/setup-r-dependencies@v2 diff --git a/src/Makevars b/src/Makevars index 2245ad22..bbc7691f 100644 --- a/src/Makevars +++ b/src/Makevars @@ -30,7 +30,10 @@ all: $(SHLIB) $(SHLIB): $(LIBUV)/.libs/libuv.a +# Avoid re-running autoconf/automake/aclocal. +# Need the timestamps in the right order. $(LIBUV)/Makefile: + touch $(LIBUV)/aclocal.m4 && touch $(LIBUV)/configure && touch $(LIBUV)/Makefile.in (cd $(LIBUV) \ && CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(R_CONFIGURE_FLAGS) --quiet)