Check-in [0dc8670b62]
Overview
Comment:* nsf/build.sh, patches/all/sf-all-noextern-fix.diff: Provide workaround for Tcl bundled with Kitcreator not providing for the EXTERN macro
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:0dc8670b62e83cdb6c0c7d21d401f6413e7319d0
User & Date: ssoberni on 2020-09-02 16:01:49
Other Links: manifest | tags
Context
2020-09-09
14:18
* tcllib/build.sh: Bump version to 1.20 Leaf check-in: 6ec29741dc user: ssoberni tags: trunk
11:14
* tclbdd/build.sh: Add build descriptor for tclbdd [1e7f92c8ba] check-in: 6c7c2f8719 user: ssoberni tags: mr_calvin-tclbdd
2020-09-02
16:01
* nsf/build.sh, patches/all/sf-all-noextern-fix.diff: Provide workaround for Tcl bundled with Kitcreator not providing for the EXTERN macro check-in: 0dc8670b62 user: ssoberni tags: trunk
2020-05-02
21:00
Fixed bug building SDK check-in: 18e328360d user: rkeene tags: trunk
Changes

Modified nsf/build.sh from [62d42d68c3] to [975f0987e4].

    29     29       SRCURL="http://sourceforge.net/projects/next-scripting/files/${NSFVERS}/nsf${NSFVERS}.tar.gz/download"
    30     30       SRCHASH='dec695b908f286dda128b62be717a4248ebd31e7'
    31     31   fi
    32     32   
    33     33   BUILDDIR="$(pwd)/build/nsf${NSFVERS}"
    34     34   OUTDIR="$(pwd)/out"
    35     35   INSTDIR="$(pwd)/inst"
    36         -export NSFVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
           36  +PATCHDIR="$(pwd)/patches"
           37  +export NSFVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
    37     38   
    38     39   # Set configure options for this sub-project
    39     40   LDFLAGS="${LDFLAGS} ${KC_NSF_LDFLAGS}"
    40     41   CFLAGS="${CFLAGS} ${KC_NSF_CFLAGS}"
    41     42   CPPFLAGS="${CPPFLAGS} ${KC_NSF_CPPFLAGS}"
    42     43   LIBS="${LIBS} ${KC_NSF_LIBS}"
    43     44   export LDFLAGS CFLAGS CPPFLAGS LIBS
................................................................................
    70     71   
    71     72       if [ "${use_git}" = "1" ]; then
    72     73   	## the GIT zip tarball does not preserve file permissions (configure)
    73     74   	rm -rf configure
    74     75   	autoconf || exit 1
    75     76       fi
    76     77   
           78  +    # Apply patches if needed
           79  +    for patch in "${PATCHDIR}/all"/nsf-${NSFVERS}-*.diff "${PATCHDIR}/all"/nsf-all-*.diff "${PATCHDIR}/${NSFVERS}"/nsf-${NSFVERS}-*.diff; do
           80  +	if [ ! -f "${patch}" ]; then
           81  +	    continue
           82  +	fi
           83  +        
           84  +	echo "Applying: ${patch}"
           85  +	${PATCH:-patch} -p1 < "${patch}"
           86  +    done
    77     87   
    78     88       # There's a STATIC<packageInAllUpperCase>=-1,0,1
    79     89       # ... where -1 means no (i.e., shared),
    80     90       # ... 0 means try not to (try shared first, if that
    81     91       # 	  doesn't work do static),
    82     92       # ... and 1 means try to (try only static)
    83     93       

Added nsf/patches/all/nsf-all-noextern-fix.diff version [eaa4c5761a].

            1  +--- nsf2.3.0/generic/nsf.h.orig	2020-09-02 17:32:45.000000000 +0200
            2  ++++ nsf2.3.0/generic/nsf.h	2020-09-02 17:34:08.000000000 +0200
            3  +@@ -40,6 +40,20 @@
            4  + 
            5  + #include "tcl.h"
            6  + 
            7  ++/*
            8  ++ * Make sure EXTERN isn't defined elsewhere.
            9  ++ */
           10  ++
           11  ++#ifdef EXTERN
           12  ++#   undef EXTERN
           13  ++#endif /* EXTERN */
           14  ++
           15  ++#ifdef __cplusplus
           16  ++#   define EXTERN extern "C" TCL_STORAGE_CLASS
           17  ++#else
           18  ++#   define EXTERN extern TCL_STORAGE_CLASS
           19  ++#endif
           20  ++
           21  + #undef TCL_STORAGE_CLASS
           22  + #ifdef BUILD_nsf
           23  + # define TCL_STORAGE_CLASS DLLEXPORT