Changeset 825fb7 in git


Ignore:
Timestamp:
Mar 6, 2013, 6:44:01 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '5a0dde71de01068fad5736a17555c993ecbbf495')
Children:
f173183e1e8e9298c653eac481092476311ff4b5
Parents:
d5a330ab1c423ea119367c33b67f155b398bfa16
Message:
fixes for the static version
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.am

    rd5a330 r825fb7  
    412412
    413413module_LTLIBRARIES =
    414 pyobject_la_SOURCES =
    415414if PYTHON_MODULE
    416415module_LTLIBRARIES += pyobject.la
    417416pyobject_la_SOURCES += pyobject.cc
    418 endif
    419417pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
    420418pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
     
    425423pyobject_la_LDFLAGS = -export-dynamic -shared -module -avoid-version \
    426424  ${AMLDFLAGS} @PYTHON_LSPEC@
    427 
     425endif
  • Singular/iplib.cc

    rd5a330 r825fb7  
    10761076}
    10771077
    1078 #ifdef HAVE_DYNAMIC_LOADING
    10791078int iiAddCprocTop(const char *libname, const char *procname, BOOLEAN pstatic,
    10801079               BOOLEAN(*func)(leftv res, leftv v))
     
    10891088
    10901089/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
     1090#ifdef HAVE_DYNAMIC_LOADING
    10911091BOOLEAN load_modules(char *newlib, char *fullname, BOOLEAN autoexport)
    10921092{
     
    11701170#endif /*STATIC */
    11711171}
     1172#endif /* HAVE_DYNAMIC_LOADING */
    11721173/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
    11731174BOOLEAN load_builtin(char *newlib, BOOLEAN autoexport, SModulFunc_t init)
     
    12581259  void* result = NULL;
    12591260
    1260 #ifdef HAVE_STATIC
     1261#if defined(HAVE_STATIC) || !defined(HAVE_DYNAMIC_LOADING)
    12611262  WerrorS("static version can not load function from dynamic modules");
    12621263#else
     
    12801281}
    12811282
    1282 #endif /* HAVE_DYNAMIC_LOADING */
    12831283
    12841284/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
  • libpolys/polys/Makefile.am

    rd5a330 r825fb7  
    2323if ENABLE_P_PROCS_DYNAMIC
    2424  USE_P_PROCS_DYNAMIC_CC = templates/p_Procs_Dynamic.cc
     25  P_PROCS_CPPFLAGS_COMMON = ${AM_CPPFLAGS} -DDYNAMIC_VERSION
    2526else
    2627  USE_P_PROCS_DYNAMIC_CC =
     28  P_PROCS_CPPFLAGS_COMMON = ${AM_CPPFLAGS}
    2729endif
    2830
     
    7274        templates/p_Merge_q__T.cc templates/p_Add_q__T.cc templates/p_Neg__T.cc
    7375
    74 P_PROCS_CPPFLAGS_COMMON = ${AM_CPPFLAGS} -DDYNAMIC_VERSION
    7576
    7677p_Procs_FieldGeneral_la_CPPFLAGS = -Dp_Procs_FieldGeneral ${P_PROCS_CPPFLAGS_COMMON} ${NODEBUGDEFS}
  • libpolys/polys/templates/p_Procs_Static.cc

    rd5a330 r825fb7  
    4040// define DoSetProc and InitSetProcs
    4141#define SetStaticProcFromArray(what, type, field, length, ord) \
    42   _p_procs->what =            cast_vptr_to_A<what##_Proc_Ptr>( \
     42  _p_procs->what =            (what##_Proc_Ptr)( \
    4343    what##_Proc_##type [index(what##_Proc, field, length, ord)])
    4444
Note: See TracChangeset for help on using the changeset viewer.