1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) do not add the

Browse Source 
specified include directory if already included in $CPPFLAGS.

* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) return a more useful
value, [include_dir, lib_dir].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2001-04-24 06:21:58 +00:00
parent eccb4d0210
commit 4dfc822aec
3 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Apr 24 15:18:49 2001 Akinori MUSHA <knu@iDaemons.org>
* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) do not add the
specified include directory if already included in $CPPFLAGS.
* ext/extmk.rb.in, lib/mkmf.rb: (dir_config) return a more useful
value, [include_dir, lib_dir].
Sun Apr 22 17:44:37 2001 WATANABE Hirofumi <eban@ruby-lang.org> Sun Apr 22 17:44:37 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: add -mieee to CFLAGS on Linux/Alpha * configure.in: add -mieee to CFLAGS on Linux/Alpha

51
ext/extmk.rb.in
View File

@ -338,21 +338,27 @@ def dir_config(target, idefault=nil, ldefault=nil)
idefault = default + "/include" idefault = default + "/include"
ldefault = default + "/lib" ldefault = default + "/lib"
end end
dir = with_config("%s-dir"%target, default)
if dir dir = with_config(target + "-dir", default)
idir = " -I"+dir+"/include"
ldir = dir+"/lib" idir, ldir = if dir then [
end dir + "/include",
unless idir dir + "/lib"
dir = with_config("%s-include"%target, idefault) ] else [
idir = " -I"+dir if dir with_config(target + "-include", idefault),
end with_config(target + "-lib", ldefault)
unless ldir ] end
ldir = with_config("%s-lib"%target, ldefault)
if idir
idircflag = "-I" + idir
$CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
end end
$CPPFLAGS += idir if idir if ldir
$LIBPATH |= [ldir] if ldir $LIBPATH << ldir unless $LIBPATH.include?(ldir)
end
[idir, ldir]
end end
def create_makefile(target) def create_makefile(target)
@ -609,23 +615,12 @@ def extmake(target)
$local_flags = "-link /INCREMENTAL:no /EXPORT:Init_$(TARGET)" $local_flags = "-link /INCREMENTAL:no /EXPORT:Init_$(TARGET)"
end end
$LOCAL_LIBS = "" # to be assigned in extconf.rb $LOCAL_LIBS = "" # to be assigned in extconf.rb
dir = with_config("opt-dir")
if dir
idir = "-I"+dir+"/include"
ldir = dir+"/lib"
end
unless idir
dir = with_config("opt-include")
idir = "-I"+dir if dir
end
unless ldir
ldir = with_config("opt-lib")
end
$CFLAGS = "" $CFLAGS = ""
$CPPFLAGS = idir || "" $CPPFLAGS = ""
$LDFLAGS = "" $LDFLAGS = ""
$LIBPATH = [ldir].compact $LIBPATH = []
dir_config("opt")
begin begin
Dir.mkdir target unless File.directory?(target) Dir.mkdir target unless File.directory?(target)

50
lib/mkmf.rb
View File

@ -336,21 +336,27 @@ def dir_config(target, idefault=nil, ldefault=nil)
idefault = default + "/include" idefault = default + "/include"
ldefault = default + "/lib" ldefault = default + "/lib"
end end
dir = with_config("%s-dir"%target, default)
if dir dir = with_config(target + "-dir", default)
idir = " -I"+dir+"/include"
ldir = dir+"/lib" idir, ldir = if dir then [
end dir + "/include",
unless idir dir + "/lib"
dir = with_config("%s-include"%target, idefault) ] else [
idir = " -I"+dir if dir with_config(target + "-include", idefault),
end with_config(target + "-lib", ldefault)
unless ldir ] end
ldir = with_config("%s-lib"%target, ldefault)
if idir
idircflag = "-I" + idir
$CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
end end
$CPPFLAGS += idir if idir if ldir
$LIBPATH |= [ldir] if ldir $LIBPATH << ldir unless $LIBPATH.include?(ldir)
end
[idir, ldir]
end end
def create_makefile(target, srcdir = File.dirname($0)) def create_makefile(target, srcdir = File.dirname($0))
@ -581,20 +587,10 @@ $LOCAL_LIBS = ""
$defs = [] $defs = []
$make = with_config("make-prog", ENV["MAKE"] || "make") $make = with_config("make-prog", ENV["MAKE"] || "make")
dir = with_config("opt-dir")
if dir
idir = "-I"+dir+"/include"
ldir = dir+"/lib"
end
unless idir
dir = with_config("opt-include")
idir = "-I"+dir if dir
end
unless ldir
ldir = with_config("opt-lib")
end
$CFLAGS = with_config("cflags", "") $CFLAGS = with_config("cflags", "")
$CPPFLAGS = [with_config("cppflags", ""), idir].compact.join(" ") $CPPFLAGS = with_config("cppflags", "")
$LDFLAGS = with_config("ldflags", "") $LDFLAGS = with_config("ldflags", "")
$LIBPATH = [ldir].compact $LIBPATH = []
dir_config("opt")