diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 14:15:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 14:15:27 +0000 |
| commit | 89ceb340ac674debd2858cf8eef698116cfd70ed (patch) | |
| tree | 8b2ffdba0dc0faf9165693f18de2fdfb4992de5e | |
| parent | 8602707d1a9c7601f53f86c9de9e7f8d954f7e6a (diff) | |
merge revision(s) 53798,59454,59954: [Backport #14118]
* configure.in (ARFLAGS): check if deterministic mode flag is
effective, which is on by default on Ubuntu.
configure.in: use libtool
* configure.in: use libtool on macOS to suppress a warning against
debug_counter.o, which has no symbols unless USE_DEBUG_COUNTER
is set to non-zero.
configure.in: use newer libtool only
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 25 insertions, 2 deletions
@@ -1,3 +1,14 @@ +Sun Mar 18 23:11:29 2018 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (ARFLAGS): check if deterministic mode flag is + effective, which is on by default on Ubuntu. + + * configure.in: use libtool on macOS to suppress a warning against + debug_counter.o, which has no symbols unless USE_DEBUG_COUNTER is + set to non-zero. + + * configure.in: use newer libtool only + Sat Feb 17 01:21:00 2018 SHIBATA Hiroshi <hsbt@ruby-lang.org> Merge RubyGems 2.7.6 from upstream. diff --git a/Makefile.in b/Makefile.in index ff475091ab..a663447696 100644 --- a/Makefile.in +++ b/Makefile.in @@ -163,7 +163,7 @@ RMDIRS = @RMDIRS@ RMALL = @RMALL@ NM = @NM@ AR = @AR@ -ARFLAGS = rcu +ARFLAGS = @ARFLAGS@$(empty) RANLIB = @RANLIB@ AS = @AS@ ASFLAGS = @ASFLAGS@ $(INCFLAGS) diff --git a/configure.in b/configure.in index b5ba86213f..c085853fde 100644 --- a/configure.in +++ b/configure.in @@ -556,11 +556,23 @@ AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [ CFLAGS="$save_CFLAGS" fi]) +AS_CASE(["$target_os"], [darwin*], [ +if libtool 2>&1 | grep no_warning_for_no_symbols > /dev/null; then + ac_cv_prog_ac_ct_RANLIB=: + ac_cv_prog_ac_ct_AR='libtool -static' + rb_cv_arflags='-no_warning_for_no_symbols -o' +fi +]) AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(AR, ar) if test -z "$AR"; then AC_CHECK_PROGS(AR, aal, ar) fi +AC_CACHE_CHECK([for $AR flags], [rb_cv_arflags], [ + AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a], + [rb_cv_arflags=rcD], [rb_cv_arflags=rcu]) +]) +AC_SUBST(ARFLAGS, ["$rb_cv_arflags "]) AC_CHECK_TOOL(AS, as) ASFLAGS=$ASFLAGS @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-18" -#define RUBY_PATCHLEVEL 410 +#define RUBY_PATCHLEVEL 411 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 |