1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Moved aclocal.m4 to macro directory"

Browse Source 
This reverts commit 4a6571dbc14ee4e88c12cd9931f7695077a3ee6e,
because chkbuild does not follow.
This commit is contained in:
Nobuyoshi Nakada 2020-04-05 11:53:07 +09:00
parent 4f938ffa35
commit df275179bd
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
9 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/macos.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
- name: Set ENV - name: Set ENV
run: | run: |
echo '::set-env name=JOBS::'-j$((1 + $(sysctl -n hw.activecpu))) echo '::set-env name=JOBS::'-j$((1 + $(sysctl -n hw.activecpu)))
- run: autoconf -I tool/m4 - run: autoconf
working-directory: src working-directory: src
- run: mkdir build - run: mkdir build
- name: Run configure - name: Run configure

2
.github/workflows/mingw.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
mkdir install mkdir install
mkdir temp mkdir temp
cd src cd src
sh -c "autoreconf -fi -I tool/m4" sh -c "autoreconf -fi"
- name: configure - name: configure
working-directory: build working-directory: build

2
.github/workflows/mjit.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
- name: Set ENV - name: Set ENV
run: | run: |
echo '::set-env name=JOBS::'-j$((1 + $(nproc --all))) echo '::set-env name=JOBS::'-j$((1 + $(nproc --all)))
- run: autoconf -I tool/m4 - run: autoconf
working-directory: src working-directory: src
- run: mkdir build - run: mkdir build
- name: Run configure - name: Run configure

2
.github/workflows/ubuntu.yml vendored
View File

@ -44,7 +44,7 @@ jobs:
- name: Set ENV - name: Set ENV
run: | run: |
echo '::set-env name=JOBS::'-j$((1 + $(nproc --all))) echo '::set-env name=JOBS::'-j$((1 + $(nproc --all)))
- run: autoconf -I tool/m4 - run: autoconf
working-directory: src working-directory: src
- run: mkdir build - run: mkdir build
- name: Run confiugre - name: Run confiugre

1
.gitignore vendored
View File

@ -216,7 +216,6 @@ lcov*.info
# /tool/ # /tool/
/tool/config.guess /tool/config.guess
/tool/config.sub /tool/config.sub
/tool/m4/autom4te*.cache
# /win32/ # /win32/
/win32/*.ico /win32/*.ico

2
.travis.yml
View File

@ -460,7 +460,7 @@ matrix:
fast_finish: true fast_finish: true
before_script: before_script:
- rm -fr .ext tool/m4/autom4te.cache - rm -fr .ext autom4te.cache
- |- - |-
[ -d ~/.downloaded-cache ] || [ -d ~/.downloaded-cache ] ||
mkdir ~/.downloaded-cache mkdir ~/.downloaded-cache

0
tool/m4/aclocal.m4 → aclocal.m4 vendored
View File

8
template/Makefile.in
View File

@ -366,12 +366,12 @@ reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \ @PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
set $(SHELL) $($@-args); $(reconfig-exec-$(V)) set $(SHELL) $($@-args); $(reconfig-exec-$(V))
$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(tooldir)/m4/aclocal.m4 $(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4
$(CHDIR) $(srcdir) && exec $(AUTOCONF) -I tool/m4 -o $(@F) $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
$(tooldir)/m4/aclocal.m4: $(srcdir)/aclocal.m4:
$(CHDIR) $(srcdir) && \ $(CHDIR) $(srcdir) && \
type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL) --output=tool/m4/$(@F); \ type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
touch $(@F) touch $(@F)
prereq: $(srcdir)/$(CONFIGURE) prereq: $(srcdir)/$(CONFIGURE)

3
tool/make-snapshot
View File

@ -407,14 +407,13 @@ def package(vcs, rev, destdir, tmp = nil)
end end
unless File.exist?("configure") unless File.exist?("configure")
print "creating configure..." print "creating configure..."
unless system(ENV["AUTOCONF"], "-I", "tool/m4", "-o", "configure") unless system([ENV["AUTOCONF"]]*2)
puts $colorize.fail(" failed") puts $colorize.fail(" failed")
return return
end end
puts $colorize.pass(" done") puts $colorize.pass(" done")
end end
clean.add("autom4te.cache") clean.add("autom4te.cache")
clean.add("tool/m4/autom4te.cache")
clean.add("enc/unicode/data") clean.add("enc/unicode/data")
print "creating prerequisites..." print "creating prerequisites..."
if File.file?("common.mk") && /^prereq/ =~ commonmk = IO.read("common.mk") if File.file?("common.mk") && /^prereq/ =~ commonmk = IO.read("common.mk")