Skip to content

Commit 2807019

Browse files
authored
Merge pull request #474 from r-lib/fix/no-autoconf
Avoid running autotools at install time
2 parents 6951916 + 63b59cb commit 2807019

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/dragonflybsd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Install system requirements
3939
run: |
40-
pkg install -y autoconf automake libtool hs-pandoc
40+
pkg install -y hs-pandoc
4141
shell: dragonflybsd {0}
4242

4343
- uses: r-lib/actions/setup-r-dependencies@v2

.github/workflows/freebsd.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ jobs:
4242

4343
- name: Install system requirements
4444
run: |
45-
pkg install -y hs-pandoc autoconf automake libtool
46-
ln -s aclocal /usr/local/bin/aclocal-1.16
47-
ln -s automake /usr/local/bin/automake-1.16
45+
pkg install -y hs-pandoc
4846
shell: freebsd {0}
4947

5048
- uses: r-lib/actions/setup-r-dependencies@v2

.github/workflows/netbsd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Install system dependencies
3939
shell: netbsd {0}
4040
run: |
41-
pkg_add autoconf automake libtool pandoc png
41+
pkg_add pandoc png
4242
# these do not work in the end, but I'll leave them here
4343
ln -s libpng16.so /usr/pkg/lib/libpng.so
4444
ln -s libfontconfig.so /usr/pkg/lib/libfontconfig.so.2

.github/workflows/openbsd.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ jobs:
4545

4646
- name: Install system dependencies
4747
run: |
48-
pkg_add -I pandoc automake-1.16.5 libtool
49-
echo 'export AUTOCONF_VERSION=2.69' >> /etc/profile
48+
pkg_add -I pandoc
5049
shell: openbsd {0}
5150

5251
- uses: r-lib/actions/setup-r-dependencies@v2

src/Makevars

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ all: $(SHLIB)
3030

3131
$(SHLIB): $(LIBUV)/.libs/libuv.a
3232

33+
# Avoid re-running autoconf/automake/aclocal.
34+
# Need the timestamps in the right order.
3335
$(LIBUV)/Makefile:
36+
touch $(LIBUV)/aclocal.m4 && touch $(LIBUV)/configure && touch $(LIBUV)/Makefile.in
3437
(cd $(LIBUV) \
3538
&& CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure $(R_CONFIGURE_FLAGS) --quiet)
3639

0 commit comments

Comments
 (0)