Overview
Comment: | Updated to link to stubs |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
82593f3a0f6ffc55b873ec9b434f98b0 |
User & Date: | rkeene on 2014-06-21 14:49:24 |
Other Links: | manifest | tags |
Context
2014-06-21
| ||
15:31 | Updated "make test" to not try to run sed on binary files check-in: 9aad02dffb user: rkeene tags: trunk | |
14:49 | Updated to link to stubs check-in: 82593f3a0f user: rkeene tags: trunk | |
05:59 | Updated to allow libtcc1.c to compile under TCC check-in: f49bec1323 user: rkeene tags: trunk | |
Changes
Modified build/tcc-patches/0.9.26/tcc-0.9.26-tcl.diff from [e03734effa] to [259708aa9d].
1 | --- tcc-0.9.26.orig/configure 2013-02-15 08:24:00.000000000 -0600 | > | | 1 2 3 4 5 6 7 8 9 10 | diff -uNr tcc-0.9.26.orig/configure tcc-0.9.26-1tcl/configure --- tcc-0.9.26.orig/configure 2013-02-15 08:24:00.000000000 -0600 +++ tcc-0.9.26-1tcl/configure 2014-06-21 09:48:08.270011999 -0500 @@ -43,6 +43,7 @@ tcc_libpaths="" tcc_crtprefix="" tcc_elfinterp="" +tcc_tcl_path="" tcc_lddir= confvars= |
︙ | ︙ | |||
21 22 23 24 25 26 27 | --libpaths=... specify system library paths, colon separated --crtprefix=... specify locations of crt?.o, colon separated --elfinterp=... specify elf interpreter + --with-tcl=... specify path to Tcl EOF #echo "NOTE: The object files are build at the place where configure is launched" exit 1 | | > > > > > | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | --libpaths=... specify system library paths, colon separated --crtprefix=... specify locations of crt?.o, colon separated --elfinterp=... specify elf interpreter + --with-tcl=... specify path to Tcl EOF #echo "NOTE: The object files are build at the place where configure is launched" exit 1 @@ -339,6 +343,29 @@ esac fi +print_tcl_defs() { + ( + tclConfig="$1" + . "${tclConfig}" + if [ "${TCL_SUPPORTS_STUBS}" = '1' ]; then + TCL_LIBS="${TCL_LIBS} ${TCL_STUB_LIB_SPEC}" + fi + + LDFLAGS="$LDFLAGS $TCL_LIB_SPEC $TCL_LIBS" + CFLAGS="$CFLAGS $TCL_INCLUDE_SPEC -DHAVE_TCL_H=1" + set | egrep '^(CFLAGS|LDFLAGS)=' + ) +} + +if [ -n "${tcc_tcl_path}" ]; then + for tcc_tcl_path_file in ${tcc_tcl_path}/{,lib,lib64}/tclConfig.sh; do + if [ -f "${tcc_tcl_path_file}" ]; then + eval `print_tcl_defs "${tcc_tcl_path_file}"` + break + fi + done +fi + cat <<EOF Binary directory $bindir TinyCC directory $tccdir diff -uNr tcc-0.9.26.orig/tcc.h tcc-0.9.26-1tcl/tcc.h --- tcc-0.9.26.orig/tcc.h 2013-02-15 08:24:00.000000000 -0600 +++ tcc-0.9.26-1tcl/tcc.h 2014-06-21 09:38:52.910011999 -0500 @@ -23,6 +23,9 @@ #define _GNU_SOURCE #include "config.h" +#ifdef HAVE_TCL_H +# include <tcl.h> +#endif #ifdef CONFIG_TCCBOOT #include "tccboot.h" |