remove DISABLE_RUBYGEMS from config files

* configure.ac: removed DISABLE_RUBYGEMS macro from config.h, not
  to rebuild everything when the flag changed.

* configure.ac, win32/configure.bat: make USE_RUBYGEMS lowercase.

* tool/mkconfig.rb: remove RUBYGEMS stuff from rbconfig.rb, not to
  reconfigure and rebuild all extension libraries.

* Makefile.in (CPPFLAGS): enable/disable Rubygems by USE_RUBYGEMS.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-06-22 04:13:02 +00:00
Родитель 0ad9c00525
Коммит 64a189d207
5 изменённых файлов: 11 добавлений и 6 удалений

Просмотреть файл

@ -72,7 +72,9 @@ warnflags = @warnflags@ @strict_warnflags@
cppflags = @cppflags@
MATHN = @MATHN@
XCFLAGS = @XCFLAGS@ $(MATHN:yes=-DCANONICALIZATION_FOR_MATHN)
CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
USE_RUBYGEMS = @USE_RUBYGEMS@
USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=)
CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1)
MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
MJIT_HEADER_SUFFIX =
MJIT_HEADER_ARCH =

Просмотреть файл

@ -3731,10 +3731,9 @@ AC_ARG_ENABLE(rubygems,
AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
[enable_rubygems="$enableval"], [enable_rubygems=yes])
AS_IF([test x"$enable_rubygems" = xno], [
AC_DEFINE(DISABLE_RUBYGEMS, 1)
USE_RUBYGEMS=NO
USE_RUBYGEMS=no
], [
USE_RUBYGEMS=YES
USE_RUBYGEMS=yes
])
AC_SUBST(USE_RUBYGEMS)

Просмотреть файл

@ -70,6 +70,7 @@ File.foreach "config.status" do |line|
when /^arch$/; if val.empty? then val = arch else arch = val end
when /^sitearch$/; val = '$(arch)' if val.empty?
when /^DESTDIR$/; next
when /RUBYGEMS/; next
end
case val
when /^\$\(ac_\w+\)$/; next

Просмотреть файл

@ -299,6 +299,9 @@ LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -ou
LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest
!endif
CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
!if "$(USE_RUBYGEMS)" == "no"
CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS)
!endif
!if "$(CPPOUTFLAG)" == ">"
MJIT_HEADER_FLAGS =
!else

Просмотреть файл

@ -143,12 +143,12 @@ goto :loop ;
shift
goto :loop ;
:enable-rubygems
echo>> ~tmp~.mak "USE_RUBYGEMS=YES" \
echo>> ~tmp~.mak "USE_RUBYGEMS=yes" \
echo>>confargs.tmp %1 \
shift
goto :loop ;
:disable-rubygems
echo>> ~tmp~.mak "USE_RUBYGEMS=NO" \
echo>> ~tmp~.mak "USE_RUBYGEMS=no" \
echo>>confargs.tmp %1 \
shift
goto :loop ;