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: |
0dc8670b62e83cdb6c0c7d21d401f641 |
| 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 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 30 31 32 33 34 35 |
SRCURL="http://sourceforge.net/projects/next-scripting/files/${NSFVERS}/nsf${NSFVERS}.tar.gz/download"
SRCHASH='dec695b908f286dda128b62be717a4248ebd31e7'
fi
BUILDDIR="$(pwd)/build/nsf${NSFVERS}"
OUTDIR="$(pwd)/out"
INSTDIR="$(pwd)/inst"
| > | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 |
SRCURL="http://sourceforge.net/projects/next-scripting/files/${NSFVERS}/nsf${NSFVERS}.tar.gz/download"
SRCHASH='dec695b908f286dda128b62be717a4248ebd31e7'
fi
BUILDDIR="$(pwd)/build/nsf${NSFVERS}"
OUTDIR="$(pwd)/out"
INSTDIR="$(pwd)/inst"
PATCHDIR="$(pwd)/patches"
export NSFVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
# Set configure options for this sub-project
LDFLAGS="${LDFLAGS} ${KC_NSF_LDFLAGS}"
CFLAGS="${CFLAGS} ${KC_NSF_CFLAGS}"
CPPFLAGS="${CPPFLAGS} ${KC_NSF_CPPFLAGS}"
LIBS="${LIBS} ${KC_NSF_LIBS}"
export LDFLAGS CFLAGS CPPFLAGS LIBS
|
| ︙ | ︙ | |||
70 71 72 73 74 75 76 77 78 79 80 81 82 83 |
if [ "${use_git}" = "1" ]; then
## the GIT zip tarball does not preserve file permissions (configure)
rm -rf configure
autoconf || exit 1
fi
# There's a STATIC<packageInAllUpperCase>=-1,0,1
# ... where -1 means no (i.e., shared),
# ... 0 means try not to (try shared first, if that
# doesn't work do static),
# ... and 1 means try to (try only static)
| > > > > > > > > > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 |
if [ "${use_git}" = "1" ]; then
## the GIT zip tarball does not preserve file permissions (configure)
rm -rf configure
autoconf || exit 1
fi
# Apply patches if needed
for patch in "${PATCHDIR}/all"/nsf-${NSFVERS}-*.diff "${PATCHDIR}/all"/nsf-all-*.diff "${PATCHDIR}/${NSFVERS}"/nsf-${NSFVERS}-*.diff; do
if [ ! -f "${patch}" ]; then
continue
fi
echo "Applying: ${patch}"
${PATCH:-patch} -p1 < "${patch}"
done
# There's a STATIC<packageInAllUpperCase>=-1,0,1
# ... where -1 means no (i.e., shared),
# ... 0 means try not to (try shared first, if that
# doesn't work do static),
# ... and 1 means try to (try only static)
|
| ︙ | ︙ |
Added nsf/patches/all/nsf-all-noextern-fix.diff version [eaa4c5761a].
> > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | --- nsf2.3.0/generic/nsf.h.orig 2020-09-02 17:32:45.000000000 +0200 +++ nsf2.3.0/generic/nsf.h 2020-09-02 17:34:08.000000000 +0200 @@ -40,6 +40,20 @@ #include "tcl.h" +/* + * Make sure EXTERN isn't defined elsewhere. + */ + +#ifdef EXTERN +# undef EXTERN +#endif /* EXTERN */ + +#ifdef __cplusplus +# define EXTERN extern "C" TCL_STORAGE_CLASS +#else +# define EXTERN extern TCL_STORAGE_CLASS +#endif + #undef TCL_STORAGE_CLASS #ifdef BUILD_nsf # define TCL_STORAGE_CLASS DLLEXPORT |