net/freeswitch/patches/musl/configure_ac.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -257,9 +257,9 @@ AX_COMPILER_VENDOR
   4  if test "x${cross_compiling}" = "xyes"; then
   5      CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
   6      case "$host" in
   7 -        arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
   8 +        arm*-linux-gnueabi*|arm*-*-linux-*)
   9                 # spandsp modem
  10 -               ac_cv_file__dev_ptmx=yes
  11 +               ac_cv_file__dev_ptmx=no
  12                 # libjs
  13                 export ac_cv_va_copy=yes
  14                 # srtp
  15 @@ -276,7 +276,7 @@ if test "x${cross_compiling}" = "xyes";
  16                 export apr_cv_mutex_recursive=yes
  17                 export ac_cv_func_pthread_rwlock_init=yes
  18                 export apr_cv_type_rwlock_t=yes
  19 -               export apr_cv_process_shared_works=yes
  20 +               #export apr_cv_process_shared_works=no
  21                 export apr_cv_mutex_robust_shared=yes
  22          ;;
  23      esac
  24 @@ -419,10 +419,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
  25      APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC -ffast-math)
  26      APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC -ffast-math)
  27      AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99])      # FS-8809, needed for MAP_POPULATE
  28 -    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
  29 -      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
  30 -      APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
  31 -    fi
  32      if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
  33        APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation)
  34      fi
  35 @@ -948,7 +944,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
  36
  37  AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
  38
  39 -AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
  40  AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
  41
  42  AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
  43 @@ -1560,18 +1555,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
  44  # perl checks
  45  #
  46
  47 -AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
  48 -
  49 -# -a "x$ac_cv_have_EXTERN_h" != "xno"
  50 +AC_CHECK_PROG(PERL,[perl],[yes],[no],[${STAGING_DIR_HOSTPKG}/usr/bin])
  51 +PERL=$as_dir/$ac_word$ac_exec_ext
  52
  53 -if test "x$ac_cv_have_perl" != "xno"; then
  54 -   PERL=perl
  55 -   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
  56 -   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
  57 -   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
  58 -   PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
  59 -   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
  60 -   PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
  61 +if test "x$ac_cv_prog_PERL" != "xno"; then
  62 +   PERL_VERSION="`$PERL -e 'print substr($^V, 1)' | cut -d. -f1,2`"
  63 +   PERL_SITEDIR_LOCAL="`$PERL -MConfig -e 'print $Config{archlibexp}'`"
  64 +   PERL_SITEDIR="`find ${STAGING_DIR}/usr -name $PERL_VERSION -print`"
  65 +   PERL_LIBDIR="-L$PERL_SITEDIR/CORE"
  66 +   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}' | sed -e 's|-lnsl ||g;s| -lgdbm_compat||g'`"
  67 +   PERL_CFLAGS="-w -DMULTIPLICITY -D_REENTRANT -D_GNU_SOURCE -DPERL_USE_SAFE_PUTENV `$PERL -MExtUtils::Embed -e ccopts | sed -e \"s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s| -I/usr/local/include||g\"` -DEMBED_PERL"
  68 +   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e \"s| $PERL_SITEDIR_LOCAL/auto/NDBM_File/NDBM_File.a||g;s| $PERL_SITEDIR_LOCAL/auto/ODBM_File/ODBM_File.a||g;s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s|.a |.so |g;s|-lnsl ||g;s|-lgdbm_compat ||g;s|/usr/local|${STAGING_DIR}/usr|g\"`"
  69 +   PERL_INC="-I$PERL_SITEDIR/CORE"
  70
  71     save_CFLAGS="$CFLAGS"
  72     CFLAGS="$PERL_CFLAGS"
  73 @@ -1581,34 +1576,39 @@ if test "x$ac_cv_have_perl" != "xno"; th
  74
  75     save_LDFLAGS="$LDFLAGS"
  76     LDFLAGS="$PERL_LDFLAGS"
  77 -   AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
  78 +   AC_CHECK_LIB([perl], [perl_alloc], [ac_cv_use_libperl=yes], [ac_cv_use_libperl=no])
  79     LDFLAGS="$save_LDFLAGS"
  80
  81 +   AC_SUBST(PERL)
  82     AC_SUBST(PERL_SITEDIR)
  83 +   AC_SUBST(PERL_SITEDIR_LOCAL)
  84     AC_SUBST(PERL_LIBDIR)
  85     AC_SUBST(PERL_LIBS)
  86     AC_SUBST(PERL_CFLAGS)
  87     AC_SUBST(PERL_LDFLAGS)
  88     AC_SUBST(PERL_INC)
  89 +   AC_SUBST(PERL_VERSION)
  90  fi
  91
  92 -AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"])
  93 +AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" = "xyes" -a "x$ac_cv_have_EXTERN_h" = "xyes" -a "x$ac_cv_use_libperl" = "xyes"])
  94 +#AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"])
  95
  96  #
  97  # php checks
  98  #
  99
 100  AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no])
 101 -AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no])
 102 +dnl AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
 103 +AC_CHECK_PROG(PHP_CONFIG,php7-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
 104  AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"])
 105
 106  if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
 107     PHP=php
 108 -   PHP_CONFIG=php-config
 109 +   PHP_CONFIG=${STAGING_DIR}/usr/bin/php7-config
 110     PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
 111     PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`"
 112     PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
 113 -   PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
 114 +   PHP_INC_DIR="`$PHP_CONFIG --includes | cut -d" " -f1 | cut -dI -f2`"
 115     PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"
 116     PHP_CFLAGS="`$PHP_CONFIG --includes`"
 117     AC_SUBST(PHP_LDFLAGS)
 118 @@ -1623,7 +1623,7 @@ fi
 119  # Python checks for mod_python
 120  #
 121  AC_ARG_WITH(
 122 -       [python],
 123 +       [python3],
 124         [AS_HELP_STRING([--with-python], [Use system provided version of python (default: try)])],
 125         [with_python="$withval"],
 126         [with_python="try"]
 127 @@ -1642,17 +1642,18 @@ then
 128                 AC_MSG_RESULT([$with_python])
 129                 AC_SUBST([PYTHON], ["$with_python"])
 130         else
 131 -               AC_PATH_PROG([PYTHON], ["python"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
 132 +               AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["${STAGING_DIR_HOSTPKG}/bin"])
 133         fi
 134
 135         if test "$PYTHON" != "no" ; then
 136                 AC_MSG_CHECKING([python version])
 137 -               PYTHON_VER="`$PYTHON -V 2>&1 | cut -d' ' -f2`"
 138 +               PYTHON_VER=`$PYTHON -c "import sys; print('%d.%d' % (sys.version_info[[0]], sys.version_info[[1]]))"`
 139
 140                 if test -z "$PYTHON_VER" ; then
 141                         AC_MSG_ERROR([Unable to detect python version])
 142                 fi
 143                 AC_MSG_RESULT([$PYTHON_VER])
 144 +               AC_SUBST([PYTHON_VER], [$PYTHON_VER])
 145
 146                 AC_MSG_CHECKING([for python distutils])
 147                 python_result="`$PYTHON -c 'import distutils;' 2>&1`"
 148 @@ -1666,12 +1667,12 @@ then
 149                 if test "$python_has_distutils" != "no" ; then
 150                         AC_MSG_CHECKING([location of site-packages])
 151
 152 -                       PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
 153 +                       if test -d "`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" ; then
 154 +                               PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
 155
 156 -                       if test -z "$PYTHON_SITE_DIR" ; then
 157 -                               AC_MSG_ERROR([Unable to detect python site-packages path])
 158 -                       elif test ! -d "$PYTHON_SITE_DIR" ; then
 159 -                               AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!])
 160 +                               if test -z "$PYTHON_SITE_DIR" ; then
 161 +                                       AC_MSG_ERROR([Unable to detect python site-packages path])
 162 +                               fi
 163                         fi
 164                         AC_MSG_RESULT([$PYTHON_SITE_DIR])
 165                         AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR])
 166 @@ -1679,10 +1680,10 @@ then
 167                         #
 168                         # python distutils found, get settings from python directly
 169                         #
 170 -                       PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`"
 171 +                       PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));'`"
 172                         PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`"
 173                         PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`"
 174 -                       PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
 175 +                       PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|\(^.*\)/staging_dir/hostpkg|/${STAGING_DIR}/usr|g'`"
 176
 177                         # handle python being installed into /usr/local
 178                         AC_MSG_CHECKING([python libdir])