Check-in [149997010d]
Overview
Comment:Updated to support not providing a dlopen symbol in the static archive (and default to not providing one in the shared archive)
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 149997010dc42b50a6a3e6fe105b9e8e22987c31
User & Date: rkeene on 2014-05-22 04:45:11
Other Links: manifest | tags
Context
2014-05-22
04:45
tcc4tcl 0.12 check-in: 5fb5de4c85 user: rkeene tags: trunk, 0.12
04:45
Updated to support not providing a dlopen symbol in the static archive (and default to not providing one in the shared archive) check-in: 149997010d user: rkeene tags: trunk
2014-05-20
20:15
Updated to set CPPFLAGS separately form CFLAGS check-in: 8ef4137624 user: rkeene tags: trunk
Changes

Added build/tcc-patches/0.9.26/tcc-0.9.26-dlopenoptional.diff version [8888bda434].

            1  +diff -uNr tcc-0.9.26.orig/tccrun.c tcc-0.9.26-1dlopenoptional/tccrun.c
            2  +--- tcc-0.9.26.orig/tccrun.c	2013-02-15 08:24:00.000000000 -0600
            3  ++++ tcc-0.9.26-1dlopenoptional/tccrun.c	2014-05-21 23:33:35.056517000 -0500
            4  +@@ -674,6 +674,7 @@
            5  + /* ------------------------------------------------------------- */
            6  + #ifdef CONFIG_TCC_STATIC
            7  + 
            8  ++#ifndef CONFIG_TCC_STATIC_NODLOPEN
            9  + /* dummy function for profiling */
           10  + ST_FUNC void *dlopen(const char *filename, int flag)
           11  + {
           12  +@@ -688,6 +689,7 @@
           13  + {
           14  +     return "error";
           15  + }
           16  ++#endif
           17  + 
           18  + typedef struct TCCSyms {
           19  +     char *str;

Modified configure.ac from [b2aa5f3b46] to [66cbea103c].

    33     33   
    34     34   if test "${TCC4TCL_TARGET}" = "shared"; then
    35     35   	dnl Determine how to make shared objects
    36     36   	DC_GET_SHOBJFLAGS
    37     37   
    38     38   	dnl Only export symbols we wish to expose
    39     39   	TARGET="tcc4tcl.${SHOBJEXT}"
           40  +
           41  +	no_dlopen='1'
    40     42   else
    41     43   	AC_CHECK_TOOL([RANLIB], [ranlib])
    42     44   	AC_CHECK_TOOL([AR], [ar])
    43     45   
    44     46   	TARGET="tcc4tcl-static.a"
           47  +
           48  +	no_dlopen='0'
    45     49   fi
    46     50   AC_SUBST(TARGET)
    47     51   AC_SUBST(TCC4TCL_TARGET)
           52  +
           53  +AC_ARG_WITH([dlopen], AS_HELP_STRING([--without-dlopen], [do not define dlopen/dlclose/dlerror]), [
           54  +	if test "$withval" = "no"; then
           55  +		no_dlopen='1'
           56  +	else
           57  +		no_dlopen='0'
           58  +	fi
           59  +])
           60  +
           61  +if test "$no_dlopen" = '1'; then
           62  +	CPPFLAGS="${CPPFLAGS} -DCONFIG_TCC_STATIC_NODLOPEN=1"
           63  +fi
    48     64   
    49     65   dnl Perform Tcl Extension required stuff
    50     66   TCLEXT_INIT
    51     67   
    52     68   dnl This must be done last since it breaks the compilation
    53     69   if test "${TCC4TCL_TARGET}" = "shared"; then
    54     70   	DC_SETVERSIONSCRIPT([tcc4tcl.vers], [tcc4tcl.syms])
    55     71   	DC_FIND_STRIP_AND_REMOVESYMS([tcc4tcl.syms])
    56     72   fi
    57     73   
    58     74   dnl Produce output
    59     75   AC_OUTPUT(Makefile pkgIndex.tcl tcc4tcl.syms)