Commit graph

566 commits

Author SHA1 Message Date
nobu
af5b7053f1 mkmf.rb: avoid interference
* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of
  interference by modifying global variables in have_devel? method.
  [ruby-core:67962] [Bug #10821]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-03 08:15:47 +00:00
nobu
73cce16240 mkmf.rb: set cxxflags
* lib/mkmf.rb (configuration): set the default cxxflags, which is
  referred from the default CXXFLAGS, for extension libraries.
  [Fix GH-823]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-03 03:26:38 +00:00
nobu
53d9cb7304 mkmf.rb: clean timestamps
* lib/mkmf.rb (create_makefile): clean timestamp files of
  destination directories.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-05 12:33:22 +00:00
nobu
cb5c2f07f1 mkmf.rb: use echo if possible
* lib/mkmf.rb (create_makefile): use echo for simple contents.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-28 09:13:21 +00:00
usa
46ce7c436a * lib/mkmf.rb (depend_rules): support comments during a line.
* lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency
  file contains path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 10:51:11 +00:00
usa
c93dd36e0e revert previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 10:46:38 +00:00
usa
b5cda0ffb6 * lib/mkmf.rb (depend_rules): support comments during a line.
* lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency
  file contains path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 10:43:12 +00:00
usa
89ac936266 * lib/mkmf.rb: no need to convert path separator for COPY because it's
ruby -run cp and it can treat '/' on any platform.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48057 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-20 14:21:18 +00:00
nobu
c88c049ed1 mkmf.rb: translate to assembler
* lib/mkmf.rb (create_makefile): add rules to translate to
  assembler sources.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-08 01:38:32 +00:00
nobu
097c3e9cbb mkmf.rb: -I flags to $INCFLAGS
* lib/mkmf.rb (MakeMakefile#pkg_config): separate -I flags to
  $INCFLAGS, which is used by CPP.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-09 00:27:34 +00:00
nobu
5be82d1487 mkmf.rb: --cflags to $CXXFLAGS
* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
  $CXXFLAGS, as they are often used by C++ compiler.
  [ruby-core:54532] [Bug #8315]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-09 00:02:08 +00:00
nobu
8a22a0530e mkmf.rb: try without -ObjC option
* lib/mkmf.rb (have_framework): try without -ObjC option first as
  MacPorts GCCs do not support it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-30 16:17:55 +00:00
hsbt
448c87008e * lib/cgi/core.rb: remove unused variables.
* lib/erb.rb: ditto.
* lib/mkmf.rb: ditto.
* lib/net/http/response.rb: ditto.
* lib/optparse/version.rb: ditto.
* lib/prime.rb: ditto.
* lib/racc/parser.rb: ditto.
* lib/rexml/document.rb: ditto.
* lib/rexml/dtd/dtd.rb: ditto.
* lib/rexml/element.rb: ditto.
* lib/rexml/functions.rb: ditto.
* lib/rexml/parsers/xpathparser.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-27 11:04:28 +00:00
nobu
944994b4cc mkmf.rb: add NULLCMD
* lib/mkmf.rb (configuration): add NULLCMD.

* lib/mkmf.rb (create_makefile): use NULLCMD macro.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-17 23:23:37 +00:00
nobu
29a2fe128a mkmf.rb: no messages unless needed
* lib/mkmf.rb (create_makefile): no library scripts to install, no
  installing messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-02 03:26:48 +00:00
akr
07f2563745 * (lib/tmpdir.rb): Rescue LoadError on etc.so for miniruby.
Revert r45707, r45711, r45717.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-04-29 05:19:38 +00:00
nobu
7cd7cfae77 mkmf.rb: workaround for tmpdir
* lib/mkmf.rb (try_link0): workaround for miniruby as 'tmpdir.rb'
  always requires 'etc.so' now.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-04-25 07:11:03 +00:00
nobu
69ce2b7037 mkmf.rb: prefer $LIBPATH than $DEFLIBPATH
* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
  user specified `$LIBPATH` than `$DEFLIBPATH`.  [ruby-core:62100]
  [ruby-trunk - Bug #9760]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-04-19 23:41:36 +00:00
knu
0192e15b4c * lib/mkmf.rb (MakeMakefile#dir_config): Improve documentation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-04-08 13:55:57 +00:00
nobu
8d9b300a72 dir.c: glob cases on case-insensitive system
* dir.c (glob_helper): return the filename with actual cases on
  the filesystem if it is case-insensitive.  [ruby-core:42469]
  [Feature #5994]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-04 08:20:05 +00:00
nobu
5d26de2694 mkmf.rb: fix for 1.8 baseruby
* lib/mkmf.rb (init_mkmf): fix for 1.8 baseruby.  RbConfig of 1.8
  did not have CXXFLAGS.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-31 09:32:38 +00:00
nobu
2bca263569 mkmf.rb: expand RUBY_SO_NAME
* lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions
  backward compatibility.  [ruby-core:59426] [Bug #9329]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-31 06:44:58 +00:00
sorah
e8792774df * lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-29 09:43:12 +00:00
nobu
1a1c0aeb50 mkmf.rb: strip destdir from prefix
* lib/mkmf.rb (configuration): strip destdir part from prefix to get
  rid of duplication.  a patch by arton at [ruby-core:58859].
  [ruby-core:58856] [Bug #9213]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-05 13:18:07 +00:00
nobu
3976eb12ff mkmf.rb: fix framework option
* lib/mkmf.rb (have_framework): should append framework options to
  $LIBS, not $LDFLAGS.  the former is propagated to exts.mk when
  enable-static-linked-ext.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-14 02:07:51 +00:00
nobu
85e59cc5a9 mkmf.rb: fix ranlib argument
* lib/mkmf.rb (create_makefile): ranlib on static library, not DLLIB.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-14 02:07:19 +00:00
nobu
fcb58bdb38 mkmf.rb: expand all macros
* lib/mkmf.rb (xsystem): expand environment variable in all macros not
  expanded with RbConfig.  [Bug #8702]
* test/mkmf/test_framework.rb (create_framework): replace all $@ not
  only once.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-29 05:52:53 +00:00
zzak
c366a99cc5 * lib/cgi.rb: [DOC] Capitalize "Ruby" in documentation [Fixes GH-341]
Patch by Dave Worth https://github.com/ruby/ruby/pull/341
* lib/webrick.rb: ditto
* lib/scanf.rb: ditto
* lib/xmlrpc/config.rb: ditto
* lib/resolv.rb: ditto
* lib/e2mmap.rb: ditto
* lib/fileutils.rb: ditto
* lib/mkmf.rb: ditto
* lib/cgi/session.rb: ditto
* lib/yaml.rb: ditto
* lib/erb.rb: ditto
* lib/irb.rb: ditto
* lib/tracer.rb: ditto
* lib/net/http.rb: ditto
* ext/syslog/lib/syslog/logger.rb: ditto
* sample/pty/expect_sample.rb: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-18 13:50:32 +00:00
nobu
01ca13013a mkmf.rb: config_string
* lib/mkmf.rb (CPPOUTFILE): use config_string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-05 01:53:38 +00:00
naruse
5aae89844e * lib/mkmf.rb (CONFIG['CPPOUTFILE']): fix r41769; CONFIG['CPPOUTFILE']
may be nil.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-05 00:54:14 +00:00
nobu
ab7d608632 mkmf.rb: old syntax
* lib/mkmf.rb (have_framework): get rid of newer syntax to run with
  ruby 1.8 for cross compiling.  [ruby-core:55745] [Bug #8593]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-04 15:29:50 +00:00
nobu
5d57230959 mkmf.rb: header in framework
* lib/mkmf.rb (have_framework): allow header file to check.
  [ruby-core:55745] [Bug #8593]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-04 15:25:46 +00:00
nobu
246c66f702 mkmf.rb: CONFTEST
* lib/mkmf.rb (CONFTEST): constify hardcoded filename.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-04 07:03:01 +00:00
nobu
48ebea719f mkmf.rb: revert DESTDIR prefix
* lib/mkmf.rb (install_dirs): revert DESTDIR prefix by r39841, since
  it is fixed by r41648.  [ruby-core:55760] [Bug #8115]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-03 09:12:59 +00:00
sorah
47434dc12f * lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs
(1.9.3 behavior) [ruby-core:55752] [Bug #8595]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-02 02:35:36 +00:00
nobu
70658c387d mkmf.rb: use expanded values
* lib/mkmf.rb: should use expanded values for header directories
  unless extmk.  patch by vo.x (Vit Ondruch) at [ruby-core:55653]
  [Bug #8115], rhbz#921650.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-26 07:42:13 +00:00
knu
c3b8191019 Update rdoc for pkg_config() and move :stopdoc: below to enable it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12 07:08:08 +00:00
knu
b7597efb48 Update documentation for pkg_config().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-11 08:25:40 +00:00
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 #8209]



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 #6504]

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 #8169]

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