summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclLoad.c6
-rwxr-xr-xunix/configure3
-rw-r--r--unix/tcl.m43
4 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b8112be..6206893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-04 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tclLoad.c: Patch from the cygwin folks
+ * unix/tcl.m4:
+ * unix/configure: (re-generated)
+
2012-02-29 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tclIOUtil.c: [Bug 3466099] BOM in Unicode
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index e64d0e0..ac863b9 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -308,6 +308,12 @@ Tcl_LoadObjCmd(
&& (pkgGuess[2] == 'b')) {
pkgGuess += 3;
}
+#ifdef __CYGWIN__
+ if ((pkgGuess[0] == 'c') && (pkgGuess[1] == 'y')
+ && (pkgGuess[2] == 'g')) {
+ pkgGuess += 3;
+ }
+#endif /* __CYGWIN__ */
for (p = pkgGuess; *p != 0; p += offset) {
offset = Tcl_UtfToUniChar(p, &ch);
if ((ch > 0x100)
diff --git a/unix/configure b/unix/configure
index 2ba3d68..43c2d1c 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6935,6 +6935,9 @@ fi
DL_LIBS="-ldl"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
+ TCL_NEEDS_EXP_FILE=1
+ TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
+ TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a'
;;
dgux*)
SHLIB_CFLAGS="-K PIC"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 78eacd9..37c7c74 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1245,6 +1245,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
DL_LIBS="-ldl"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
+ TCL_NEEDS_EXP_FILE=1
+ TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
+ TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$[@].a'
;;
dgux*)
SHLIB_CFLAGS="-K PIC"