kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
usa 2018-03-18 14:15:27 +00:00
parent 8602707d1a
commit 89ceb340ac
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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.

2
Makefile.in
View File

@ -163,7 +163,7 @@ RMDIRS = @RMDIRS@
RMALL = @RMALL@
NM = @NM@
AR = @AR@
ARFLAGS = rcu
ARFLAGS = @ARFLAGS@$(empty)
RANLIB = @RANLIB@
AS = @AS@
ASFLAGS = @ASFLAGS@ $(INCFLAGS)

12
configure.in
View File

@ -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

2
version.h
View File

@ -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