Changeset effb43 in git


Ignore:
Timestamp:
Jul 18, 2020, 10:44:09 AM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
Children:
5f56325b86f62a2d25723e9c60bcbfe33adebe8e
Parents:
3b1cda3853034c56d558fdc2e89453a9d4d7c14d
Message:
cross compiling: gmp
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    r3b1cda3 reffb43  
    9090
    9191# Check whether --with-gmp was given.
     92DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local"
    9293GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
    9394if test "$with_gmp" = yes ; then
    … …  
    109110  fi
    110111done
     112if test -z "${GMP_LIBS}"
     113then
     114  GMP_LIBS="-lgmp"
     115fi
     116
    111117CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
    112 LIBS="${BACKUP_LIBS} ${GMP_LIBS}"
     118LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
     119
    113120AC_SUBST(GMP_CPPFLAGS)
    114121AC_SUBST(GMP_LIBS)

  • factory/configure.ac

    r3b1cda3 reffb43  
    208208
    209209# Check whether --with-gmp was given.
     210DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local"
    210211if test "${with_gmp+set}" = set; then :
    211212  if test "$with_gmp" = yes ; then

  • gfanlib/Makefile.am

    r3b1cda3 reffb43  
    1717SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
    1818libgfan_la_SOURCES = $(SOURCES)
    19 libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) -release ${PACKAGE_VERSION}
     19libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS) -release ${PACKAGE_VERSION}
    2020
    2121libgfan_includedir =$(includedir)/gfanlib

  • gfanlib/configure.ac

    r3b1cda3 reffb43  
    4343AX_CHECK_COMPILE_FLAG([-std=c++11], [CXX11_FLAG="-std=c++11"], [CXX11_FLAG="-std=c++0x"], [])
    4444AC_SUBST(CXX11_FLAG)
     45AC_SUBST(GMP_LIBS)
     46AC_SUBST(LIBS)
    4547AC_LANG_POP()
    4648

  • m4/flint-check.m4

    r3b1cda3 reffb43  
    1414AC_DEFUN([LB_CHECK_FLINT],
    1515[
    16 DEFAULT_CHECKING_PATH="/sw /opt/local"
     16DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local"
    1717
    1818AC_ARG_WITH(flint,

  • m4/gfanlib-check.m4

    r3b1cda3 reffb43  
    2323 AC_MSG_CHECKING([whether libcddgmp is usable])
    2424
    25  BACKUP_LIBS=$LIBS
     25# Check whether --with-gmp was given.
     26DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local"
     27GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
     28if test "$with_gmp" = yes ; then
     29        GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
     30elif test "$with_gmp" != no ; then
     31        GMP_HOME_PATH="$with_gmp ${DEFAULT_CHECKING_PATH}"
     32fi
    2633
    27  LIBS="-lcddgmp -lgmp $GMP_LIBS $LIBS"
     34BACKUP_CFLAGS=${CFLAGS}
     35BACKUP_LIBS=${LIBS}
     36
     37for GMP_HOME in ${GMP_HOME_PATH}
     38do
     39  if test "x$GMP_HOME" != "x/usr"; then
     40    if test -e ${GMP_HOME}/include/gmp.h; then
     41      GMP_CPPFLAGS="-I${GMP_HOME}/include"
     42      GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
     43    fi
     44  fi
     45done
     46if test -z "${GMP_LIBS}"
     47then
     48  GMP_LIBS="-lgmp"
     49fi
     50
     51LIBS="-lcddgmp $GMP_LIBS $LIBS"
    2852
    2953 AC_LANG_PUSH(C++)
    … …  
    77101fi
    78102
    79 
    80 
    81103AM_CONDITIONAL(HAVE_GFANLIB, test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = x1)
    82104AC_DEFINE_UNQUOTED(HAVE_GFANLIB, ${PASSED_ALL_TESTS_FOR_GFANLIB}, [whether gfanlib support is enabled])

  • omalloc/Makefile.am

    r3b1cda3 reffb43  
    4141
    4242omTables.inc:
    43         $(MAKE) $(AM_MAKEFLAGS) CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" LDFLAGS="$(LDFLAGS_FOR_BUILD)" omTables
     43        $(MAKE) $(AM_MAKEFLAGS) \
     44        CC="${CC_FOR_BUILD}" \
     45        CFLAGS="${CFLAGS_FOR_BUILD}" \
     46        CPPFLAGS="-I${abs_top_srcdir}/.. -I${abs_top_builddir}/.. $(CPPFLAGS_FOR_BUILD) -DOM_GENERATE_INC" \
     47        LDFLAGS="$(LDFLAGS_FOR_BUILD)" omTables
    4448        ./omTables$(BUILD_EXEEXT) > omTables.xx && mv omTables.xx  omTables.inc
    4549
    4650omTables.h:
    4751        $(MAKE) $(AM_MAKEFLAGS) \
    48         CPPFLGAS="$(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) -DOM_GENERATE_INC" \
     52        CPPFLAGS="-I${abs_top_srcdir}/.. -I${abs_top_builddir}/.. $(CPPFLAGS_FOR_BUILD)" \
    4953        CC="${CC_FOR_BUILD}" \
    5054        CFLAGS="${CFLAGS_FOR_BUILD}" \

  • omalloc/configure.ac

    r3b1cda3 reffb43  
    2828
    2929AX_PROG_CC_FOR_BUILD
     30AC_SUBST(BUILD_EXEEXT)
    3031
    3132# Add pre'prefixed config

  • omalloc/omTables.c

    r3b1cda3 reffb43  
    1414#include <unistd.h>
    1515#include <string.h>
    16 #include "omConfig.h"
    17 #include "omDerivedConfig.h"
    18 #include "omStructs.h"
    19 #include "omAllocPrivate.h"
     16#include "omalloc/omConfig.h"
     17#include "omalloc/omDerivedConfig.h"
     18#include "omalloc/omStructs.h"
     19#include "omalloc/omAllocPrivate.h"
    2020
    2121/* Specify the minimal number of blocks which should go into a bin */

  • omalloc/omTables1.c

    r3b1cda3 reffb43  
    1414#include <unistd.h>
    1515#include <string.h>
    16 #include "omConfig.h"
    17 #include "omDerivedConfig.h"
    18 #include "omStructs.h"
    19 #include "omAllocPrivate.h"
     16#include "omalloc/omConfig.h"
     17#include "omalloc/omDerivedConfig.h"
     18#include "omalloc/omStructs.h"
     19#include "omalloc/omAllocPrivate.h"
    2020
    2121/* Specify the minimal number of blocks which should go into a bin */
Note: See TracChangeset for help on using the changeset viewer.