diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-22 04:13:02 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-22 04:13:02 +0000 |
commit | 64a189d207cd000882eeca90cfe316f830570879 (patch) | |
tree | 31b26a92932eec477f3a3407b2e3244d71b53746 | |
parent | 0ad9c00525219306e890e76251c01ba32ae0259f (diff) | |
download | ruby-64a189d207cd000882eeca90cfe316f830570879.tar.gz |
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
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rwxr-xr-x | tool/mkconfig.rb | 1 | ||||
-rw-r--r-- | win32/Makefile.sub | 3 | ||||
-rwxr-xr-x | win32/configure.bat | 4 |
5 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index a17881bd08..7d3f54a738 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 = diff --git a/configure.ac b/configure.ac index 55504c1399..d9283d9e17 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 266b1f8000..2a3af97bc5 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 48788c2aa6..20b47a581a 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -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 diff --git a/win32/configure.bat b/win32/configure.bat index cce2cc81a2..09de87a1a5 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -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 ;
|