Ticket #4022: integer-gmp-fix.diff

File integer-gmp-fix.diff, 1.9 KB (added by pgj, 4 years ago)

(Re)Add support for setting GMP include and library dirs

  • configure.ac

    diff -uNr build.orig/configure.ac build/configure.ac
    old new  
    194194AC_SUBST(ICONV_INCLUDE_DIRS) 
    195195AC_SUBST(ICONV_LIB_DIRS) 
    196196 
     197dnl Allow to specify gmp options to the toplevel configure script 
     198dnl so they can be properly passed to sub-builds. 
     199 
     200AC_ARG_WITH([gmp-includes], 
     201  [AC_HELP_STRING([--with-gmp-includes], 
     202    [directory containing gmp.h])], 
     203    [GMP_INCLUDE_DIRS=$withval]) 
     204 
     205AC_ARG_WITH([gmp-libraries], 
     206  [AC_HELP_STRING([--with-gmp-libraries], 
     207    [directory containing gmp library])], 
     208    [GMP_LIB_DIRS=$withval]) 
     209 
     210AC_SUBST(GMP_INCLUDE_DIRS) 
     211AC_SUBST(GMP_LIB_DIRS) 
     212 
    197213dnl-------------------------------------------------------------------- 
    198214dnl * Choose host(/target/build) platform 
    199215dnl-------------------------------------------------------------------- 
  • mk/config.mk.in

    diff -uNr build.orig/mk/config.mk.in build/mk/config.mk.in
    old new  
    785785ICONV_INCLUDE_DIRS = @ICONV_INCLUDE_DIRS@ 
    786786ICONV_LIB_DIRS = @ICONV_LIB_DIRS@ 
    787787 
     788GMP_INCLUDE_DIRS = @GMP_INCLUDE_DIRS@ 
     789GMP_LIB_DIRS = @GMP_LIB_DIRS@ 
  • rules/build-package-data.mk

    diff -uNr build.orig/rules/build-package-data.mk build/rules/build-package-data.mk
    old new  
    4242$1_$2_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="$$(ICONV_LIB_DIRS)" 
    4343endif 
    4444 
     45ifneq "$$(GMP_INCLUDE_DIRS)" "" 
     46$1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="$$(GMP_INCLUDE_DIRS)" 
     47endif 
     48 
     49ifneq "$$(GMP_LIB_DIRS)" "" 
     50$1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="$$(GMP_LIB_DIRS)" 
     51endif 
     52 
    4553ifeq "$3" "0" 
    4654$1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS) 
    4755endif