summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch')
-rw-r--r--meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
index 9c6ae389be..5e83e92725 100644
--- a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
+++ b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
@@ -1,4 +1,4 @@
1From ab0ab5e685bd9077c44fdca5c1a27b0f477444d7 Mon Sep 17 00:00:00 2001 1From b88a98348b3841f0b702e314631883d46f9f362d Mon Sep 17 00:00:00 2001
2From: "NODA, Kai" <nodakai@gmail.com> 2From: "NODA, Kai" <nodakai@gmail.com>
3Date: Sun, 22 Apr 2012 17:01:02 +0900 3Date: Sun, 22 Apr 2012 17:01:02 +0900
4Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32 4Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32
@@ -8,13 +8,12 @@ If it wasn't found, then fall back to a fixed string just as before.
8 8
9Upstream-Status: Submitted 9Upstream-Status: Submitted
10http://sourceforge.net/mailarchive/message.php?msg_id=29179733 10http://sourceforge.net/mailarchive/message.php?msg_id=29179733
11
12--- 11---
13 Source/Modules/main.cxx | 24 ++++++++++++++++++++++-- 12 Source/Modules/main.cxx | 24 ++++++++++++++++++++++--
14 1 file changed, 22 insertions(+), 2 deletions(-) 13 1 file changed, 22 insertions(+), 2 deletions(-)
15 14
16diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx 15diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
17index 8a44921..8250dee 100644 16index 76b4f9d..de0a512 100644
18--- a/Source/Modules/main.cxx 17--- a/Source/Modules/main.cxx
19+++ b/Source/Modules/main.cxx 18+++ b/Source/Modules/main.cxx
20@@ -25,6 +25,11 @@ 19@@ -25,6 +25,11 @@
@@ -29,7 +28,7 @@ index 8a44921..8250dee 100644
29 28
30 // Global variables 29 // Global variables
31 30
32@@ -886,9 +891,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { 31@@ -895,9 +900,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
33 32
34 // Check for SWIG_LIB environment variable 33 // Check for SWIG_LIB environment variable
35 if ((c = getenv("SWIG_LIB")) == (char *) 0) { 34 if ((c = getenv("SWIG_LIB")) == (char *) 0) {
@@ -40,7 +39,7 @@ index 8a44921..8250dee 100644
40 if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) { 39 if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
41 *(p + 1) = '\0'; 40 *(p + 1) = '\0';
42 SwigLib = NewStringf("%sLib", buf); // Native windows installation path 41 SwigLib = NewStringf("%sLib", buf); // Native windows installation path
43@@ -898,7 +903,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { 42@@ -907,7 +912,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
44 if (Len(SWIG_LIB_WIN_UNIX) > 0) 43 if (Len(SWIG_LIB_WIN_UNIX) > 0)
45 SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw) 44 SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
46 #else 45 #else