diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-04 16:39:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-04 16:39:48 (GMT) |
| commit | 006cb47ea5bad54b68b64a3d8a8788b71c19dd1b (patch) | |
| tree | e40bc3bcd27564c210916245866b4881d50cf89e | |
| parent | e7d0f5ecae05758ef91de4a3c1e6422bd82953ed (diff) | |
| parent | 47dec8659f9c449f942ca6424373d1d0fe6d80ee (diff) | |
| download | tcl-006cb47ea5bad54b68b64a3d8a8788b71c19dd1b.zip tcl-006cb47ea5bad54b68b64a3d8a8788b71c19dd1b.tar.gz tcl-006cb47ea5bad54b68b64a3d8a8788b71c19dd1b.tar.bz2 | |
Patch from the cygwin folks
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclLoad.c | 6 | ||||
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/tcl.m4 | 3 |
4 files changed, 18 insertions, 0 deletions
@@ -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-03-02 Donal K. Fellows <dkf@users.sf.net> * generic/tclBinary.c (Tcl_SetByteArrayObj): [Bug 3496014]: Only zero diff --git a/generic/tclLoad.c b/generic/tclLoad.c index 820707e..202e66a 100644 --- a/generic/tclLoad.c +++ b/generic/tclLoad.c @@ -305,6 +305,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 72d704d..72d5d73 100755 --- a/unix/configure +++ b/unix/configure @@ -7061,6 +7061,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 2f7cb16..39f8ca1 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1228,6 +1228,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" |