mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@103424 d073be05-634f-4543-b044-5fe20cf6d1d6
57 lines
2.8 KiB
Diff
57 lines
2.8 KiB
Diff
--- ext/tk/extconf.rb.orig 2011-06-30 12:53:30.000000000 +0900
|
|
+++ ext/tk/extconf.rb 2013-02-26 00:25:13.000000000 +0900
|
|
@@ -612,7 +612,7 @@
|
|
$INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
|
|
else
|
|
tcllibs = append_library($libs, libname)
|
|
- tcllibs = "-L#{tcldir.quote} -Wl,-R#{tcldir.quote} " + tcllibs
|
|
+ tcllibs = "-L#{tcldir.quote} -Wl,-rpath,#{tcldir.quote} " + tcllibs
|
|
|
|
# FIX ME: avoid pathname trouble (fail to find) on MinGW.
|
|
$INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
|
|
@@ -654,7 +654,7 @@
|
|
else
|
|
tklibs = append_library("", libname)
|
|
#tklibs = append_library("", $1)
|
|
- tklibs = "-L#{tkdir.quote} -Wl,-R#{tkdir.quote} " + tklibs
|
|
+ tklibs = "-L#{tkdir.quote} -Wl,-rpath,#{tkdir.quote} " + tklibs
|
|
|
|
# FIX ME: avoid pathname trouble (fail to find) on MinGW.
|
|
$INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
|
|
@@ -1123,7 +1123,7 @@
|
|
tcllibs = libs_param + " -DSTATIC_BUILD " + fname.quote
|
|
else
|
|
tcllibs = append_library($libs, lib_w_sufx)
|
|
- tcllibs = "-L#{path.quote} -Wl,-R#{path.quote} " + tcllibs
|
|
+ tcllibs = "-L#{path.quote} -Wl,-rpath,#{path.quote} " + tcllibs
|
|
end
|
|
if try_func(func, tcllibs, ["tcl.h"])
|
|
return [true, path, nil, tcllibs, *inc]
|
|
@@ -1262,7 +1262,7 @@
|
|
tklibs = libs_param + " -DSTATIC_BUILD " + fname.quote
|
|
else
|
|
tklibs = append_library($libs, lib_w_sufx)
|
|
- tklibs = "-L#{path.quote} -Wl,-R#{path.quote} " + tklibs
|
|
+ tklibs = "-L#{path.quote} -Wl,-rpath,#{path.quote} " + tklibs
|
|
end
|
|
if try_func(func, tklibs, ["tcl.h", "tk.h"])
|
|
return [true, path, nil, tklibs, *inc]
|
|
@@ -1945,7 +1945,7 @@
|
|
# MacOS X Frameworks?
|
|
if TkLib_Config["tcltk-framework"]
|
|
puts("Use MacOS X Frameworks.")
|
|
- ($LDFLAGS ||= "") << " -L#{TkLib_Config["tcl-build-dir"].quote} -Wl,-R#{TkLib_Config["tcl-build-dir"].quote}" if TkLib_Config["tcl-build-dir"]
|
|
+ ($LDFLAGS ||= "") << " -L#{TkLib_Config["tcl-build-dir"].quote} -Wl,-rpath,#{TkLib_Config["tcl-build-dir"].quote}" if TkLib_Config["tcl-build-dir"]
|
|
|
|
if tcl_cfg_dir
|
|
TclConfig_Info['TCL_LIBS'] ||= ""
|
|
@@ -1970,7 +1970,7 @@
|
|
end
|
|
end
|
|
|
|
- $LDFLAGS << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-R#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"]
|
|
+ $LDFLAGS << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-rpath,#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"]
|
|
|
|
if tk_cfg_dir
|
|
TkConfig_Info['TK_LIBS'] ||= ""
|