[前][次][番号順一覧][スレッド一覧]

ruby-changes:60658

From: Nobuyoshi <ko1@a...>
Date: Sun, 5 Apr 2020 11:54:46 +0900 (JST)
Subject: [ruby-changes:60658] df275179bd (master): Revert "Moved aclocal.m4 to macro directory"

https://git.ruby-lang.org/ruby.git/commit/?id=df275179bd

From df275179bde5eef92b701789b99e88ae038cdae2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 5 Apr 2020 11:53:07 +0900
Subject: Revert "Moved aclocal.m4 to macro directory"

This reverts commit 4a6571dbc14ee4e88c12cd9931f7695077a3ee6e,
because chkbuild does not follow.

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ff7e391..5765c05 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -35,7 +35,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/macos.yml#L35
       - name: Set ENV
         run: |
           echo '::set-env name=JOBS::'-j$((1 + $(sysctl -n hw.activecpu)))
-      - run: autoconf -I tool/m4
+      - run: autoconf
         working-directory: src
       - run: mkdir build
       - name: Run configure
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 0efc08a..5cccb09 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -68,7 +68,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L68
           mkdir install
           mkdir temp
           cd src
-          sh -c "autoreconf -fi -I tool/m4"
+          sh -c "autoreconf -fi"
 
       - name: configure
         working-directory: build
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index dff58f8..08a659e 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -38,7 +38,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mjit.yml#L38
       - name: Set ENV
         run: |
           echo '::set-env name=JOBS::'-j$((1 + $(nproc --all)))
-      - run: autoconf -I tool/m4
+      - run: autoconf
         working-directory: src
       - run: mkdir build
       - name: Run configure
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 23a8827..c98d05c 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -44,7 +44,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L44
       - name: Set ENV
         run: |
           echo '::set-env name=JOBS::'-j$((1 + $(nproc --all)))
-      - run: autoconf -I tool/m4
+      - run: autoconf
         working-directory: src
       - run: mkdir build
       - name: Run confiugre
diff --git a/.gitignore b/.gitignore
index 27f1a94..916c7aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -216,7 +216,6 @@ lcov*.info https://github.com/ruby/ruby/blob/trunk/.gitignore#L216
 # /tool/
 /tool/config.guess
 /tool/config.sub
-/tool/m4/autom4te*.cache
 
 # /win32/
 /win32/*.ico
diff --git a/.travis.yml b/.travis.yml
index 17f7be9..1bd1ce8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -460,7 +460,7 @@ matrix: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L460
   fast_finish: true
 
 before_script:
-  - rm -fr .ext tool/m4/autom4te.cache
+  - rm -fr .ext autom4te.cache
   - |-
     [ -d ~/.downloaded-cache ] ||
     mkdir ~/.downloaded-cache
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..2477ff4
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,47 @@ https://github.com/ruby/ruby/blob/trunk/aclocal.m4#L1
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_include([tool/m4/_colorize_result_prepare.m4])
+m4_include([tool/m4/ac_msg_result.m4])
+m4_include([tool/m4/colorize_result.m4])
+m4_include([tool/m4/ruby_append_option.m4])
+m4_include([tool/m4/ruby_append_options.m4])
+m4_include([tool/m4/ruby_check_builtin_func.m4])
+m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
+m4_include([tool/m4/ruby_check_printf_prefix.m4])
+m4_include([tool/m4/ruby_check_setjmp.m4])
+m4_include([tool/m4/ruby_check_signedness.m4])
+m4_include([tool/m4/ruby_check_sizeof.m4])
+m4_include([tool/m4/ruby_check_sysconf.m4])
+m4_include([tool/m4/ruby_cppoutfile.m4])
+m4_include([tool/m4/ruby_decl_attribute.m4])
+m4_include([tool/m4/ruby_default_arch.m4])
+m4_include([tool/m4/ruby_define_if.m4])
+m4_include([tool/m4/ruby_defint.m4])
+m4_include([tool/m4/ruby_dtrace_available.m4])
+m4_include([tool/m4/ruby_dtrace_postprocess.m4])
+m4_include([tool/m4/ruby_func_attribute.m4])
+m4_include([tool/m4/ruby_mingw32.m4])
+m4_include([tool/m4/ruby_prepend_option.m4])
+m4_include([tool/m4/ruby_prog_gnu_ld.m4])
+m4_include([tool/m4/ruby_replace_funcs.m4])
+m4_include([tool/m4/ruby_replace_type.m4])
+m4_include([tool/m4/ruby_rm_recursive.m4])
+m4_include([tool/m4/ruby_setjmp_type.m4])
+m4_include([tool/m4/ruby_stack_grow_direction.m4])
+m4_include([tool/m4/ruby_try_cflags.m4])
+m4_include([tool/m4/ruby_try_ldflags.m4])
+m4_include([tool/m4/ruby_type_attribute.m4])
+m4_include([tool/m4/ruby_universal_arch.m4])
+m4_include([tool/m4/ruby_werror_flag.m4])
diff --git a/template/Makefile.in b/template/Makefile.in
index 51ee854..33ea093 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -366,12 +366,12 @@ reconfig config.status:	$(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L366
 	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
 	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
-$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(tooldir)/m4/aclocal.m4
-	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -I tool/m4 -o $(@F)
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.ac $(srcdir)/aclocal.m4
+	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
 
-$(tooldir)/m4/aclocal.m4:
+$(srcdir)/aclocal.m4:
 	$(CHDIR) $(srcdir) && \
-	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL) --output=tool/m4/$(@F); \
+	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
 	touch $(@F)
 
 prereq: $(srcdir)/$(CONFIGURE)
diff --git a/tool/m4/aclocal.m4 b/tool/m4/aclocal.m4
deleted file mode 100644
index 2477ff4..0000000
--- a/tool/m4/aclocal.m4
+++ /dev/null
@@ -1,47 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L0
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([tool/m4/_colorize_result_prepare.m4])
-m4_include([tool/m4/ac_msg_result.m4])
-m4_include([tool/m4/colorize_result.m4])
-m4_include([tool/m4/ruby_append_option.m4])
-m4_include([tool/m4/ruby_append_options.m4])
-m4_include([tool/m4/ruby_check_builtin_func.m4])
-m4_include([tool/m4/ruby_check_builtin_setjmp.m4])
-m4_include([tool/m4/ruby_check_printf_prefix.m4])
-m4_include([tool/m4/ruby_check_setjmp.m4])
-m4_include([tool/m4/ruby_check_signedness.m4])
-m4_include([tool/m4/ruby_check_sizeof.m4])
-m4_include([tool/m4/ruby_check_sysconf.m4])
-m4_include([tool/m4/ruby_cppoutfile.m4])
-m4_include([tool/m4/ruby_decl_attribute.m4])
-m4_include([tool/m4/ruby_default_arch.m4])
-m4_include([tool/m4/ruby_define_if.m4])
-m4_include([tool/m4/ruby_defint.m4])
-m4_include([tool/m4/ruby_dtrace_available.m4])
-m4_include([tool/m4/ruby_dtrace_postprocess.m4])
-m4_include([tool/m4/ruby_func_attribute.m4])
-m4_include([tool/m4/ruby_mingw32.m4])
-m4_include([tool/m4/ruby_prepend_option.m4])
-m4_include([tool/m4/ruby_prog_gnu_ld.m4])
-m4_include([tool/m4/ruby_replace_funcs.m4])
-m4_include([tool/m4/ruby_replace_type.m4])
-m4_include([tool/m4/ruby_rm_recursive.m4])
-m4_include([tool/m4/ruby_setjmp_type.m4])
-m4_include([tool/m4/ruby_stack_grow_direction.m4])
-m4_include([tool/m4/ruby_try_cflags.m4])
-m4_include([tool/m4/ruby_try_ldflags.m4])
-m4_include([tool/m4/ruby_type_attribute.m4])
-m4_include([tool/m4/ruby_universal_arch.m4])
-m4_include([tool/m4/ruby_werror_flag.m4])
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 901ec14..79289d6 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -407,14 +407,13 @@ def package(vcs, rev, destdir, tmp = nil) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L407
     end
     unless File.exist?("configure")
       print "creating configure..."
-      unless system(ENV["AUTOCONF"], "-I", "tool/m4", "-o", "configure")
+      unless system([ENV["AUTOCONF"]]*2)
         puts $colorize.fail(" failed")
         return
       end
       puts $colorize.pass(" done")
     end
     clean.add("autom4te.cache")
-    clean.add("tool/m4/autom4te.cache")
     clean.add("enc/unicode/data")
     print "creating prerequisites..."
     if File.file?("common.mk") && /^prereq/ =~ commonmk = IO.read("common.mk")
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]