1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Commit graph

528 commits

Author SHA1 Message Date
naruse
34f5700a09 * lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other
than nmke.

* ext/ripper/depend: use VPATH expecting removed by above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 18:00:25 +00:00
nobu
34b706ff0a mkmf.rb: timestamp directory
* lib/mkmf.rb (timestamp_file): gather timestamp files in one
  directory from each extension directories.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 14:06:33 +00:00
usa
b77d1a4f34 * lib/mkmf.rb (MakeMakefile#create_makefile): output new macro
disthdrdir to specify the path of id.h, parse.h and etc.

* ext/ripper/depend: use above macro.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 12:14:37 +00:00
akr
b47138580c * lib/mkmf.rb: Add ruby/ruby.h, ruby/missing.h, ruby/intern.h,
ruby/st.h and ruby/subst.h for ruby_headers in generated Makefile.

* ext/-test-/old_thread_select/depend: Update dependencies.

* ext/-test-/wait_for_single_fd/depend: Ditto.

* ext/bigdecimal/depend: Ditto.

* ext/curses/depend: Ditto.

* ext/digest/bubblebabble/depend: Ditto.

* ext/digest/depend: Ditto.

* ext/digest/md5/depend: Ditto.

* ext/digest/rmd160/depend: Ditto.

* ext/digest/sha1/depend: Ditto.

* ext/digest/sha2/depend: Ditto.

* ext/dl/callback/depend: Ditto.

* ext/dl/depend: Ditto.

* ext/etc/depend: Ditto.

* ext/nkf/depend: Ditto.

* ext/objspace/depend: Ditto.

* ext/pty/depend: Ditto.

* ext/readline/depend: Ditto.

* ext/ripper/depend: Ditto.

* ext/sdbm/depend: Ditto.

* ext/socket/depend: Ditto.

* ext/stringio/depend: Ditto.

* ext/strscan/depend: Ditto.

* ext/syslog/depend: Ditto.

* ext/-test-/num2int/depend: Removed.

* ext/dbm/depend: Ditto.

* ext/fcntl/depend: Ditto.

* ext/gdbm/depend: Ditto.

* ext/racc/cparse/depend: Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 00:46:29 +00:00
nobu
09d4be59b5 mkmf.rb: suppress warnings
* lib/mkmf.rb (try_func, try_var, scalar_ptr_type, scalar_type):
  suppress implicit-function-declaration warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11 01:11:27 +00:00
naruse
c607493e48 * lib/mkmf.rb (pkg_config): Add optional argument "option".
If it is given, it returns the result of
  `pkg-config --<option> <pkgname>`.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-10 21:15:32 +00:00
nobu
0a4ed02461 mkmf.rb: timestamp directory
* lib/mkmf.rb (timestamp_file): gather timestamp files in one
  directory from each extension directories, with considering
  target_prefix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-09 01:02:53 +00:00
naruse
fc7c2faab3 Revert r40194 "mkmf.rb: timestamp directory"
It breaks build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-08 20:51:52 +00:00
nobu
46eddae1b4 mkmf.rb: timestamp directory
* lib/mkmf.rb (timestamp_file): gather timestamp files in one
  directory from each extension directories.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-08 18:10:04 +00:00
akr
1d339ff212 * ext/extmk.rb (extmake): Use Logging.open to switch stdout and
stderr.  Delay Logging::log_close until the failure message is
  written.  Write the failure message only if log file is opened.

* lib/mkmf.rb (Logging.log_opened?): New method.

  [ruby-dev:47215] [Bug ]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03 10:00:49 +00:00
nobu
2e26edb633 mkmf.rb: no CFLAGS in CXXFLAGS
* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
  use different set than C for C++.  [ruby-core:45273] [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-29 02:09:51 +00:00
nobu
56f2447e5a mkmf.rb: force refererence in MAIN_DOES_NOTHING
* lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be
  preserved.  [ruby-core:53745] [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-28 15:55:05 +00:00
nobu
89b49d4598 mkmf.rb: force refererence in MAIN_DOES_NOTHING
* lib/mkmf.rb (MAIN_DOES_NOTHING): force to refer symbols for tests
  to be preserved.  [ruby-core:53745] [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26 21:39:50 +00:00
nobu
9cbd4ac367 mkmf.rb: format message
* lib/mkmf.rb (find_library): fix to format message.
  [ruby-core:53568] [Bug ]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:53:16 +00:00
nobu
7e1d504594 mkmf.rb: prefix install_dirs only with DESTDIR
* lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR
  directories to install only unless bundled extension libraries.
  [ruby-core:53502] [Bug ]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20 13:52:54 +00:00
nobu
76d8cc33f9 mkmf.rb: defer use of instance variable
* lib/mkmf.rb (MakeMakefile#dir_config, MakeMakefile#_libdir_basename):
  defer use of instance variable until needed.  [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-11 02:53:47 +00:00
nobu
d71177feab mkmf.rb: libpath_env
* lib/mkmf.rb (MakeMakefile#libpath_env): ignore empty LIBPATHENV.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-03 04:15:02 +00:00
nobu
bb2551b41c mkmf.rb: libpath_env
* lib/mkmf.rb (MakeMakefile#libpath_env): set runtime library path for
  the case rpath is disabled.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-03 03:35:11 +00:00
nobu
773248551b mswin: static-linked-ext
* enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile):
  define RUBY_EXPORT for static-linked-ext mswin.  [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 15:04:23 +00:00
nobu
593ffbcf71 mkmf.rb: default libdirname
* lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir.
* tool/rbinstall.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-25 05:41:16 +00:00
nobu
b9ef804fb8 mkmf.rb: adjust default library path
* lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
  for multiarch.  [Bug ]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 02:33:44 +00:00
nobu
1264600d5c mkmf.rb: remove extra topdir in VPATH
* lib/mkmf.rb: remove extra topdir in VPATH, which was in
  win32/Makefile.sub for some reason and moved from there.
  [ruby-dev:46998] [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-17 08:23:25 +00:00
nobu
b0488c5bb1 mkmf.rb: fail if cross compiling
* lib/mkmf.rb (MakeMakefile#try_run): bail out explicitly if cross
  compiling, because it cannot work of course.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-15 09:24:50 +00:00
nobu
978c0f0f04 mkmf.rb: RUBY_VERSION_NAME
* lib/mkmf.rb (MakeMakefile#configuration): set all ruby names.
  hdrdir now needs RUBY_VERSION_NAME.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 00:35:20 +00:00
nobu
13b11810e2 mkmf.rb: fix merge_libs
* lib/mkmf.rb (MakeMakefile#merge_libs): insert following reversal
  ordered elements just after the duplicated element, not overwriting
  successive elements.  [ruby-core:50314] [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-07 06:33:22 +00:00
nobu
67db06ba97 configure.in: arch dependent header directory options
* configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
  options to customize architecture dependent header directories.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-06 08:32:58 +00:00
drbrain
c8a4d4b071 * lib/mkmf.rb: Documented MakeMakefile constants. Hid implementation
details from RDoc 


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-25 01:37:06 +00:00
nobu
894f6ba7f1 mkmf.rb: large unsigned
* lib/mkmf.rb (MakeMakefile#try_constant): fix for large unsigned.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-23 07:18:06 +00:00
nobu
5d223fabb7 mkmf.rb: larger constants
* lib/mkmf.rb (MakeMakefile#try_constant): fix for larger constants.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-23 07:18:01 +00:00
nobu
d78a00cc0c mkmf.rb: $extmk for symlink
* lib/mkmf.rb ($extmk): traverse parent directories for the case
  srcdir is a symlink.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-21 04:51:24 +00:00
nobu
c669931941 vpath.rb: hack for msys make
* tool/vpath.rb (VPath#def_options): hack for msys make, which
  converts a command line argument to non-msys command seems like a
  path list automagically.  [Bug ] [ruby-core:51489]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-20 13:24:31 +00:00
nobu
2b8485bc89 configure.in, mkmf.rb: sign extensions
* configure.in (codesign): check identifier at link time, not
  configure time.

* lib/mkmf.rb (LINK_SO): sign extensions too.  replace empty line with
  default command.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-10 04:18:13 +00:00
nobu
1692d49338 mkmf.rb: different strings from conflict markers
* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
  strings from conflict markers.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-05 02:37:41 +00:00
nobu
a0f7f36a5a mkmf.rb: each_compile_rules
* lib/mkmf.rb (MakeMakefile#each_compile_rules): splat $(*VPATH*) for
  each VPATH elements.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-28 12:19:49 +00:00
nobu
e54cd2bd97 mkmf.rb: mingw64+MSYS pkg-config fix
* lib/mkmf.rb (MakeMakefile#pkg_config): strip all white spaces for
  mingw64+MSYS pkg-config which errouneously emits extra newlines.
  [ruby-core:47998] [Bug ]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-23 14:44:45 +00:00
nobu
5f06ee7ea0 mkmf.rb: timestamp_file
* lib/mkmf.rb (MakeMakefile#timestamp_file): remove @ which looks like
  configure variables.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-02 11:11:21 +00:00
nobu
e627955d14 mkmf.rb: timestamp_file
* lib/mkmf.rb (MakeMakefile#timestamp_file): use .-. instead of !, a
  special character of NMAKE and BSD make.  [Bug ]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-02 11:02:27 +00:00
nobu
1d4ec583c7 mkmf.rb: timestamp_file
* lib/mkmf.rb (MakeMakefile#timestamp_file): use ! instead of %, a GNU
  make special character.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-01 19:41:38 +00:00
naruse
072ab753ec lib/mkmf.rb: fix for if config["libdir"] is nil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-01 18:24:39 +00:00
nobu
e6c5b9f308 revert r37326 "remove string literal concatenation"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37328 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-25 14:06:31 +00:00
nobu
db1f7079b6 remove string literal concatenation
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-25 10:07:22 +00:00
nobu
1b4c99c057 mkmf.rb: use configured libdir value
* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
  default library path.  [ruby-core:43726] [Bug ]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 05:10:43 +00:00
nobu
aed254f314 mkmf.rb: unspace
* lib/mkmf.rb (String#unspace): unescape with backslashes.  normal
  makes need to escape spaces with backslashes.  nmake is not the
  case.  [Bug ]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-23 12:52:01 +00:00
nobu
ba3d600583 mkmf.rb: directory timestamp
* lib/mkmf.rb (create_makefile): use timestamp file dependencies for
  directories.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-23 12:48:15 +00:00
nobu
9f4f154501 mkmf.rb: unexpand macros
* lib/mkmf.rb: unexpand macros.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-23 12:46:48 +00:00
nobu
255e1b05b1 mkmf.rb: library path quote
* lib/mkmf.rb (LIBPATHFLAG): no needs to escape library path here.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-23 12:45:21 +00:00
nobu
de9093ad29 mkmf.rb: use internal path
* lib/mkmf.rb (MakeMakefile#configuration): make prefix paths
  internal to deal with in Makefile.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-23 12:44:30 +00:00
nobu
87fe2bfdcf mkmf.rb: fallback mkintpath
* lib/mkmf.rb (MakeMakefile#mkintpath): not a global function now.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-23 12:42:29 +00:00
nobu
ecc80b3cb4 mkmf.rb: untabify
* lib/mkmf.rb: untabify.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-21 00:35:09 +00:00
nobu
9445ab2d98 mkmf.rb: fix $LDFLAGS
* lib/mkmf.rb (have_framework): insert a space between options.
  add just one -ObjC option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-11 00:44:30 +00:00