Check-in [82593f3a0f]
Overview
Comment:Updated to link to stubs
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 82593f3a0f6ffc55b873ec9b434f98b0015aa52f
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  +diff -uNr tcc-0.9.26.orig/configure tcc-0.9.26-1tcl/configure
     1      2   --- tcc-0.9.26.orig/configure	2013-02-15 08:24:00.000000000 -0600
     2         -+++ tcc-0.9.26-1tcl/configure	2014-05-01 19:50:10.103740647 -0500
            3  ++++ tcc-0.9.26-1tcl/configure	2014-06-21 09:48:08.270011999 -0500
     3      4   @@ -43,6 +43,7 @@
     4      5    tcc_libpaths=""
     5      6    tcc_crtprefix=""
     6      7    tcc_elfinterp=""
     7      8   +tcc_tcl_path=""
     8      9    tcc_lddir=
     9     10    confvars=
................................................................................
    21     22      --libpaths=...           specify system library paths, colon separated
    22     23      --crtprefix=...          specify locations of crt?.o, colon separated
    23     24      --elfinterp=...          specify elf interpreter
    24     25   +  --with-tcl=...           specify path to Tcl
    25     26    EOF
    26     27    #echo "NOTE: The object files are build at the place where configure is launched"
    27     28    exit 1
    28         -@@ -339,6 +343,25 @@
           29  +@@ -339,6 +343,29 @@
    29     30      esac
    30     31    fi
    31     32    
    32     33   +print_tcl_defs() {
    33     34   +	(
    34     35   +		tclConfig="$1"
    35     36   +		. "${tclConfig}"
           37  ++		if [ "${TCL_SUPPORTS_STUBS}" = '1' ]; then
           38  ++			TCL_LIBS="${TCL_LIBS} ${TCL_STUB_LIB_SPEC}"
           39  ++		fi
           40  ++
    36     41   +		LDFLAGS="$LDFLAGS $TCL_LIB_SPEC $TCL_LIBS"
    37     42   +		CFLAGS="$CFLAGS $TCL_INCLUDE_SPEC -DHAVE_TCL_H=1"
    38     43   +		set | egrep '^(CFLAGS|LDFLAGS)='
    39     44   +	)
    40     45   +}
    41     46   +
    42     47   +if [ -n "${tcc_tcl_path}" ]; then
................................................................................
    47     52   +		fi
    48     53   +	done
    49     54   +fi
    50     55   +
    51     56    cat <<EOF
    52     57    Binary  directory   $bindir
    53     58    TinyCC directory    $tccdir
           59  +diff -uNr tcc-0.9.26.orig/tcc.h tcc-0.9.26-1tcl/tcc.h
    54     60   --- tcc-0.9.26.orig/tcc.h	2013-02-15 08:24:00.000000000 -0600
    55         -+++ tcc-0.9.26-1tcl/tcc.h	2014-05-01 19:50:24.973630534 -0500
           61  ++++ tcc-0.9.26-1tcl/tcc.h	2014-06-21 09:38:52.910011999 -0500
    56     62   @@ -23,6 +23,9 @@
    57     63    
    58     64    #define _GNU_SOURCE
    59     65    #include "config.h"
    60     66   +#ifdef HAVE_TCL_H
    61     67   +#  include <tcl.h>
    62     68   +#endif
    63     69    
    64     70    #ifdef CONFIG_TCCBOOT
    65     71    #include "tccboot.h"