Index: dbus/build.sh ================================================================== --- dbus/build.sh +++ dbus/build.sh @@ -25,14 +25,14 @@ OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" export DBUSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR # Set configure options for this sub-project -LDFLAGS="${KC_DBUS_LDFLAGS}" -CFLAGS="${KC_DBUS_CFLAGS}" -CPPFLAGS="${KC_DBUS_CPPFLAGS}" -LIBS="${KC_DBUS_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_DBUS_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_DBUS_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_DBUS_CPPFLAGS}" +LIBS="${LIBS} ${KC_DBUS_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS if [ ! -f "${SRC}" ]; then mkdir 'src' >/dev/null 2>/dev/null Index: itcl/build.sh ================================================================== --- itcl/build.sh +++ itcl/build.sh @@ -19,14 +19,14 @@ OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" export ITCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR # Set configure options for this sub-project -LDFLAGS="${KC_ITCL_LDFLAGS}" -CFLAGS="${KC_ITCL_CFLAGS}" -CPPFLAGS="${KC_ITCL_CPPFLAGS}" -LIBS="${KC_ITCL_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_ITCL_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_ITCL_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_ITCL_CPPFLAGS}" +LIBS="${LIBS} ${KC_ITCL_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: kitsh/build.sh ================================================================== --- kitsh/build.sh +++ kitsh/build.sh @@ -18,14 +18,14 @@ OTHERPKGSDIR="$(pwd)/../" export KITSHVERS BUILDDIR OUTDIR INSTDIR OTHERPKGSDIR # Set configure options for this sub-project LDFLAGS_ADD="${KC_KITSH_LDFLAGS_ADD}" -LDFLAGS="${KC_KITSH_LDFLAGS}" -CFLAGS="${KC_KITSH_CFLAGS}" -CPPFLAGS="${KC_KITSH_CPPFLAGS}" -LIBS="${KC_KITSH_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_KITSH_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_KITSH_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_KITSH_CPPFLAGS}" +LIBS="${LIBS} ${KC_KITSH_LIBS}" export LDFLAGS_ADD LDFLAGS CFLAGS CPPFLAGS LIBS if [ -z "${ENABLECOMPRESSION}" ]; then ENABLECOMPRESSION="1" fi Index: mk4tcl/build.sh ================================================================== --- mk4tcl/build.sh +++ mk4tcl/build.sh @@ -19,14 +19,15 @@ INSTDIR="$(pwd)/inst" PATCHDIR="$(pwd)/patches" export MK4VERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR # Set configure options for this sub-project -LDFLAGS="${KC_MK4TCL_LDFLAGS}" -CFLAGS="${KC_MK4TCL_CFLAGS}" -CPPFLAGS="${KC_MK4TCL_CPPFLAGS}" -LIBS="${KC_MK4TCL_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_MK4TCL_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_MK4TCL_CFLAGS}" +CXXFLAGS="${CXXFLAGS} ${KC_MK4TCL_CXXFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_MK4TCL_CPPFLAGS}" +LIBS="${LIBS} ${KC_MK4TCL_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: tcc4tcl/build.sh ================================================================== --- tcc4tcl/build.sh +++ tcc4tcl/build.sh @@ -19,14 +19,14 @@ INSTDIR="$(pwd)/inst" PATCHDIR="$(pwd)/patches" export TCC4TCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR # Set configure options for this sub-project -LDFLAGS="${KC_TCC4TCL_LDFLAGS}" -CFLAGS="${KC_TCC4TCL_CFLAGS}" -CPPFLAGS="${KC_TCC4TCL_CPPFLAGS}" -LIBS="${KC_TCC4TCL_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_TCC4TCL_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_TCC4TCL_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_TCC4TCL_CPPFLAGS}" +LIBS="${LIBS} ${KC_TCC4TCL_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: tcl/build.sh ================================================================== --- tcl/build.sh +++ tcl/build.sh @@ -19,14 +19,14 @@ PATCHSCRIPTDIR="$(pwd)/patchscripts" PATCHDIR="$(pwd)/patches" export SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHSCRIPTDIR PATCHDIR # Set configure options for this sub-project -LDFLAGS="${KC_TCL_LDFLAGS}" -CFLAGS="${KC_TCL_CFLAGS}" -CPPFLAGS="${KC_TCL_CPPFLAGS}" -LIBS="${KC_TCL_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_TCL_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_TCL_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_TCL_CPPFLAGS}" +LIBS="${LIBS} ${KC_TCL_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: tclvfs/build.sh ================================================================== --- tclvfs/build.sh +++ tclvfs/build.sh @@ -19,14 +19,14 @@ INSTDIR="$(pwd)/inst" PATCHDIR="$(pwd)/patches" export TCLVFSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR # Set configure options for this sub-project -LDFLAGS="${KC_TCLVFS_LDFLAGS}" -CFLAGS="${KC_TCLVFS_CFLAGS}" -CPPFLAGS="${KC_TCLVFS_CPPFLAGS}" -LIBS="${KC_TCLVFS_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_TCLVFS_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_TCLVFS_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_TCLVFS_CPPFLAGS}" +LIBS="${LIBS} ${KC_TCLVFS_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: tclx/build.sh ================================================================== --- tclx/build.sh +++ tclx/build.sh @@ -19,14 +19,14 @@ INSTDIR="$(pwd)/inst" PATCHDIR="$(pwd)/patches" export TCLXVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR # Set configure options for this sub-project -LDFLAGS="${KC_TCLX_LDFLAGS}" -CFLAGS="${KC_TCLX_CFLAGS}" -CPPFLAGS="${KC_TCLX_CPPFLAGS}" -LIBS="${KC_TCLX_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_TCLX_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_TCLX_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_TCLX_CPPFLAGS}" +LIBS="${LIBS} ${KC_TCLX_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: thread/build.sh ================================================================== --- thread/build.sh +++ thread/build.sh @@ -18,14 +18,14 @@ OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" export THREADVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR # Set configure options for this sub-project -LDFLAGS="${KC_THREAD_LDFLAGS}" -CFLAGS="${KC_THREAD_CFLAGS}" -CPPFLAGS="${KC_THREAD_CPPFLAGS}" -LIBS="${KC_THREAD_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_THREAD_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_THREAD_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_THREAD_CPPFLAGS}" +LIBS="${LIBS} ${KC_THREAD_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: tk/build.sh ================================================================== --- tk/build.sh +++ tk/build.sh @@ -19,14 +19,14 @@ INSTDIR="$(pwd)/inst" PATCHSCRIPTDIR="$(pwd)/patchscripts" export SRC SRCURL BUILDDIR PATCHDIR OUTDIR INSTDIR PATCHSCRIPTDIR # Set configure options for this sub-project -LDFLAGS="${KC_TK_LDFLAGS}" -CFLAGS="${KC_TK_CFLAGS}" -CPPFLAGS="${KC_TK_CPPFLAGS}" -LIBS="${KC_TK_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_TK_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_TK_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_TK_CPPFLAGS}" +LIBS="${LIBS} ${KC_TK_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS # Must be kept in-sync with "../tcl/build.sh" TCLFOSSILDATE="../tcl/src/tcl${TCLVERS}.tar.gz.date" export TCLFOSSILDATE Index: tls/build.sh ================================================================== --- tls/build.sh +++ tls/build.sh @@ -19,14 +19,14 @@ INSTDIR="$(pwd)/inst" PATCHDIR="$(pwd)/patches" export TLSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR # Set configure options for this sub-project -LDFLAGS="${KC_TLS_LDFLAGS}" -CFLAGS="${KC_TLS_CFLAGS}" -CPPFLAGS="${KC_TLS_CPPFLAGS}" -LIBS="${KC_TLS_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_TLS_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_TLS_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_TLS_CPPFLAGS}" +LIBS="${LIBS} ${KC_TLS_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 Index: zlib/build.sh ================================================================== --- zlib/build.sh +++ zlib/build.sh @@ -18,14 +18,14 @@ OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR # Set configure options for this sub-project -LDFLAGS="${KC_ZLIB_LDFLAGS}" -CFLAGS="${KC_ZLIB_CFLAGS}" -CPPFLAGS="${KC_ZLIB_CPPFLAGS}" -LIBS="${KC_ZLIB_LIBS}" +LDFLAGS="${LDFLAGS} ${KC_ZLIB_LDFLAGS}" +CFLAGS="${CFLAGS} ${KC_ZLIB_CFLAGS}" +CPPFLAGS="${CPPFLAGS} ${KC_ZLIB_CPPFLAGS}" +LIBS="${LIBS} ${KC_ZLIB_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1