Check-in [fddc41b4b8]
Overview
Comment:Updated to include global CFLAGS/LDFLAGS/CPPFLAGS/LIBS in addition to per-project settings
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fddc41b4b8efd9008e4d7c6e72819a64309c3451
User & Date: rkeene on 2014-05-20 22:58:57
Other Links: manifest | tags
Context
2014-05-21
00:55
Updated to use stdint in Metakit to determine integer types check-in: 79b6f2657b user: rkeene tags: trunk
2014-05-20
22:58
Updated to include global CFLAGS/LDFLAGS/CPPFLAGS/LIBS in addition to per-project settings check-in: fddc41b4b8 user: rkeene tags: trunk
20:33
Updated to correct issue where Metakit fails to build but is not detected check-in: 930c36ab1f user: rkeene tags: trunk
Changes

Modified dbus/build.sh from [e9059f054d] to [f52d4218f1].

    23     23   SRCURL="http://sourceforge.net/projects/dbus-tcl/files/dbus/${DBUSVERS}/dbus-${DBUSVERS}.tar.gz/download"
    24     24   BUILDDIR="$(pwd)/build/dbus-${DBUSVERS}"
    25     25   OUTDIR="$(pwd)/out"
    26     26   INSTDIR="$(pwd)/inst"
    27     27   export DBUSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
    28     28   
    29     29   # Set configure options for this sub-project
    30         -LDFLAGS="${KC_DBUS_LDFLAGS}"
    31         -CFLAGS="${KC_DBUS_CFLAGS}"
    32         -CPPFLAGS="${KC_DBUS_CPPFLAGS}"
    33         -LIBS="${KC_DBUS_LIBS}"
           30  +LDFLAGS="${LDFLAGS} ${KC_DBUS_LDFLAGS}"
           31  +CFLAGS="${CFLAGS} ${KC_DBUS_CFLAGS}"
           32  +CPPFLAGS="${CPPFLAGS} ${KC_DBUS_CPPFLAGS}"
           33  +LIBS="${LIBS} ${KC_DBUS_LIBS}"
    34     34   export LDFLAGS CFLAGS CPPFLAGS LIBS
    35     35   
    36     36   if [ ! -f "${SRC}" ]; then
    37     37   	mkdir 'src' >/dev/null 2>/dev/null
    38     38   
    39     39   	if [ ! -d 'buildsrc' ]; then
    40     40   		rm -f "${SRC}.tmp"

Modified itcl/build.sh from [66f0227cb2] to [c79eb69747].

    17     17   SRCURL="http://sourceforge.net/projects/incrtcl/files/%5BIncr%20Tcl_Tk%5D-source/${ITCLVERS}/itcl${ITCLVERS}${ITCLVERSEXTRA}.tar.gz/download"
    18     18   BUILDDIR="$(pwd)/build/itcl${ITCLVERS}"
    19     19   OUTDIR="$(pwd)/out"
    20     20   INSTDIR="$(pwd)/inst"
    21     21   export ITCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_ITCL_LDFLAGS}"
    25         -CFLAGS="${KC_ITCL_CFLAGS}"
    26         -CPPFLAGS="${KC_ITCL_CPPFLAGS}"
    27         -LIBS="${KC_ITCL_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_ITCL_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_ITCL_CFLAGS}"
           26  +CPPFLAGS="${CPPFLAGS} ${KC_ITCL_CPPFLAGS}"
           27  +LIBS="${LIBS} ${KC_ITCL_LIBS}"
    28     28   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     29   
    30     30   rm -rf 'build' 'out' 'inst'
    31     31   mkdir 'build' 'out' 'inst' || exit 1
    32     32   
    33     33   # Determine if Itcl is even needed
    34     34   (

Modified kitsh/build.sh from [d39ebd9770] to [ddd5d26892].

    16     16   OUTDIR="$(pwd)/out"
    17     17   INSTDIR="$(pwd)/inst"
    18     18   OTHERPKGSDIR="$(pwd)/../"
    19     19   export KITSHVERS BUILDDIR OUTDIR INSTDIR OTHERPKGSDIR
    20     20   
    21     21   # Set configure options for this sub-project
    22     22   LDFLAGS_ADD="${KC_KITSH_LDFLAGS_ADD}"
    23         -LDFLAGS="${KC_KITSH_LDFLAGS}"
    24         -CFLAGS="${KC_KITSH_CFLAGS}"
    25         -CPPFLAGS="${KC_KITSH_CPPFLAGS}"
    26         -LIBS="${KC_KITSH_LIBS}"
           23  +LDFLAGS="${LDFLAGS} ${KC_KITSH_LDFLAGS}"
           24  +CFLAGS="${CFLAGS} ${KC_KITSH_CFLAGS}"
           25  +CPPFLAGS="${CPPFLAGS} ${KC_KITSH_CPPFLAGS}"
           26  +LIBS="${LIBS} ${KC_KITSH_LIBS}"
    27     27   export LDFLAGS_ADD LDFLAGS CFLAGS CPPFLAGS LIBS
    28     28   
    29     29   if [ -z "${ENABLECOMPRESSION}" ]; then
    30     30   	ENABLECOMPRESSION="1"
    31     31   fi
    32     32   export ENABLECOMPRESSION
    33     33   

Modified mk4tcl/build.sh from [a7ae1d5383] to [b69a612055].

    17     17   BUILDDIR="$(pwd)/build/metakit-${MK4VERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   PATCHDIR="$(pwd)/patches"
    21     21   export MK4VERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_MK4TCL_LDFLAGS}"
    25         -CFLAGS="${KC_MK4TCL_CFLAGS}"
    26         -CPPFLAGS="${KC_MK4TCL_CPPFLAGS}"
    27         -LIBS="${KC_MK4TCL_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_MK4TCL_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_MK4TCL_CFLAGS}"
           26  +CXXFLAGS="${CXXFLAGS} ${KC_MK4TCL_CXXFLAGS}"
           27  +CPPFLAGS="${CPPFLAGS} ${KC_MK4TCL_CPPFLAGS}"
           28  +LIBS="${LIBS} ${KC_MK4TCL_LIBS}"
    28     29   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     30   
    30     31   rm -rf 'build' 'out' 'inst'
    31     32   mkdir 'build' 'out' 'inst' || exit 1
    32     33   
    33     34   TCL_VERSION="unknown"
    34     35   if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then

Modified tcc4tcl/build.sh from [b26578a863] to [59f44c8b6b].

    17     17   BUILDDIR="$(pwd)/build/tcc4tcl-${TCC4TCLVERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   PATCHDIR="$(pwd)/patches"
    21     21   export TCC4TCLVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_TCC4TCL_LDFLAGS}"
    25         -CFLAGS="${KC_TCC4TCL_CFLAGS}"
    26         -CPPFLAGS="${KC_TCC4TCL_CPPFLAGS}"
    27         -LIBS="${KC_TCC4TCL_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_TCC4TCL_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_TCC4TCL_CFLAGS}"
           26  +CPPFLAGS="${CPPFLAGS} ${KC_TCC4TCL_CPPFLAGS}"
           27  +LIBS="${LIBS} ${KC_TCC4TCL_LIBS}"
    28     28   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     29   
    30     30   rm -rf 'build' 'out' 'inst'
    31     31   mkdir 'build' 'out' 'inst' || exit 1
    32     32   
    33     33   TCL_VERSION="unknown"
    34     34   if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then

Modified tcl/build.sh from [21af131d5c] to [99f31c134b].

    17     17   OUTDIR="$(pwd)/out"
    18     18   INSTDIR="$(pwd)/inst"
    19     19   PATCHSCRIPTDIR="$(pwd)/patchscripts"
    20     20   PATCHDIR="$(pwd)/patches"
    21     21   export SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHSCRIPTDIR PATCHDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_TCL_LDFLAGS}"
    25         -CFLAGS="${KC_TCL_CFLAGS}"
    26         -CPPFLAGS="${KC_TCL_CPPFLAGS}"
    27         -LIBS="${KC_TCL_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_TCL_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_TCL_CFLAGS}"
           26  +CPPFLAGS="${CPPFLAGS} ${KC_TCL_CPPFLAGS}"
           27  +LIBS="${LIBS} ${KC_TCL_LIBS}"
    28     28   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     29   
    30     30   rm -rf 'build' 'out' 'inst'
    31     31   mkdir 'build' 'out' 'inst' || exit 1
    32     32   
    33     33   if [ ! -f "${SRC}" ]; then
    34     34   	mkdir 'src' >/dev/null 2>/dev/null

Modified tclvfs/build.sh from [cad3e76073] to [7e37283f7c].

    17     17   BUILDDIR="$(pwd)/build/tclvfs-${TCLVFSVERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   PATCHDIR="$(pwd)/patches"
    21     21   export TCLVFSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_TCLVFS_LDFLAGS}"
    25         -CFLAGS="${KC_TCLVFS_CFLAGS}"
    26         -CPPFLAGS="${KC_TCLVFS_CPPFLAGS}"
    27         -LIBS="${KC_TCLVFS_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_TCLVFS_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_TCLVFS_CFLAGS}"
           26  +CPPFLAGS="${CPPFLAGS} ${KC_TCLVFS_CPPFLAGS}"
           27  +LIBS="${LIBS} ${KC_TCLVFS_LIBS}"
    28     28   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     29   
    30     30   rm -rf 'build' 'out' 'inst'
    31     31   mkdir 'build' 'out' 'inst' || exit 1
    32     32   
    33     33   TCL_VERSION="unknown"
    34     34   if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then

Modified tclx/build.sh from [b9cc1abd7b] to [e8fda61b35].

    17     17   BUILDDIR="$(pwd)/build/tclx8.4"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   PATCHDIR="$(pwd)/patches"
    21     21   export TCLXVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_TCLX_LDFLAGS}"
    25         -CFLAGS="${KC_TCLX_CFLAGS}"
    26         -CPPFLAGS="${KC_TCLX_CPPFLAGS}"
    27         -LIBS="${KC_TCLX_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_TCLX_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_TCLX_CFLAGS}"
           26  +CPPFLAGS="${CPPFLAGS} ${KC_TCLX_CPPFLAGS}"
           27  +LIBS="${LIBS} ${KC_TCLX_LIBS}"
    28     28   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     29   
    30     30   rm -rf 'build' 'out' 'inst'
    31     31   mkdir 'build' 'out' 'inst' || exit 1
    32     32   
    33     33   TCL_VERSION="unknown"
    34     34   if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then

Modified thread/build.sh from [1e6b680b6e] to [a260bfcb8c].

    16     16   SRCURL="http://sourceforge.net/projects/tcl/files/Thread%20Extension/${THREADVERS}/thread${THREADVERS}.tar.gz/download"
    17     17   BUILDDIR="$(pwd)/build/thread${THREADVERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   export THREADVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
    21     21   
    22     22   # Set configure options for this sub-project
    23         -LDFLAGS="${KC_THREAD_LDFLAGS}"
    24         -CFLAGS="${KC_THREAD_CFLAGS}"
    25         -CPPFLAGS="${KC_THREAD_CPPFLAGS}"
    26         -LIBS="${KC_THREAD_LIBS}"
           23  +LDFLAGS="${LDFLAGS} ${KC_THREAD_LDFLAGS}"
           24  +CFLAGS="${CFLAGS} ${KC_THREAD_CFLAGS}"
           25  +CPPFLAGS="${CPPFLAGS} ${KC_THREAD_CPPFLAGS}"
           26  +LIBS="${LIBS} ${KC_THREAD_LIBS}"
    27     27   export LDFLAGS CFLAGS CPPFLAGS LIBS
    28     28   
    29     29   rm -rf 'build' 'out' 'inst'
    30     30   mkdir 'build' 'out' 'inst' || exit 1
    31     31   
    32     32   # Determine if Threads is even needed
    33     33   (

Modified tk/build.sh from [d87b27b303] to [cdaaafe15a].

    17     17   PATCHDIR="$(pwd)/patches"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   PATCHSCRIPTDIR="$(pwd)/patchscripts"
    21     21   export SRC SRCURL BUILDDIR PATCHDIR OUTDIR INSTDIR PATCHSCRIPTDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_TK_LDFLAGS}"
    25         -CFLAGS="${KC_TK_CFLAGS}"
    26         -CPPFLAGS="${KC_TK_CPPFLAGS}"
    27         -LIBS="${KC_TK_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_TK_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_TK_CFLAGS}"
           26  +CPPFLAGS="${CPPFLAGS} ${KC_TK_CPPFLAGS}"
           27  +LIBS="${LIBS} ${KC_TK_LIBS}"
    28     28   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     29   
    30     30   # Must be kept in-sync with "../tcl/build.sh"
    31     31   TCLFOSSILDATE="../tcl/src/tcl${TCLVERS}.tar.gz.date"
    32     32   export TCLFOSSILDATE
    33     33   
    34     34   rm -rf 'build' 'out' 'inst'

Modified tls/build.sh from [a1f308b67a] to [aec06a1dc7].

    17     17   BUILDDIR="$(pwd)/build/tls${TLSVERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   PATCHDIR="$(pwd)/patches"
    21     21   export TLSVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR
    22     22   
    23     23   # Set configure options for this sub-project
    24         -LDFLAGS="${KC_TLS_LDFLAGS}"
    25         -CFLAGS="${KC_TLS_CFLAGS}"
    26         -CPPFLAGS="${KC_TLS_CPPFLAGS}"
    27         -LIBS="${KC_TLS_LIBS}"
           24  +LDFLAGS="${LDFLAGS} ${KC_TLS_LDFLAGS}"
           25  +CFLAGS="${CFLAGS} ${KC_TLS_CFLAGS}"
           26  +CPPFLAGS="${CPPFLAGS} ${KC_TLS_CPPFLAGS}"
           27  +LIBS="${LIBS} ${KC_TLS_LIBS}"
    28     28   export LDFLAGS CFLAGS CPPFLAGS LIBS
    29     29   
    30     30   rm -rf 'build' 'out' 'inst'
    31     31   mkdir 'build' 'out' 'inst' || exit 1
    32     32   
    33     33   TCL_VERSION="unknown"
    34     34   if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then

Modified zlib/build.sh from [7da32bb1e0] to [13b1c7bf71].

    16     16   SRCURL="http://sourceforge.net/projects/libpng/files/zlib/${ZLIBVERS}/zlib-${ZLIBVERS}.tar.gz/download"
    17     17   BUILDDIR="$(pwd)/build/zlib-${ZLIBVERS}"
    18     18   OUTDIR="$(pwd)/out"
    19     19   INSTDIR="$(pwd)/inst"
    20     20   export ZLIBVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR
    21     21   
    22     22   # Set configure options for this sub-project
    23         -LDFLAGS="${KC_ZLIB_LDFLAGS}"
    24         -CFLAGS="${KC_ZLIB_CFLAGS}"
    25         -CPPFLAGS="${KC_ZLIB_CPPFLAGS}"
    26         -LIBS="${KC_ZLIB_LIBS}"
           23  +LDFLAGS="${LDFLAGS} ${KC_ZLIB_LDFLAGS}"
           24  +CFLAGS="${CFLAGS} ${KC_ZLIB_CFLAGS}"
           25  +CPPFLAGS="${CPPFLAGS} ${KC_ZLIB_CPPFLAGS}"
           26  +LIBS="${LIBS} ${KC_ZLIB_LIBS}"
    27     27   export LDFLAGS CFLAGS CPPFLAGS LIBS
    28     28   
    29     29   rm -rf 'build' 'out' 'inst'
    30     30   mkdir 'build' 'out' 'inst' || exit 1
    31     31   
    32     32   if [ ! -f "${SRC}" ]; then
    33     33   	mkdir 'src' >/dev/null 2>/dev/null