<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13875">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">check_expr2: fix cross-compile/hardening issues<br><br>When building check_expr2 with ASLR PIE hardening enabled the linker<br>fails. This is resolved by adding the regular compiler flags when<br>building the object files from ast_expr2f.c and ast_expr2.c.<br><br>Note: The STANDALONE define is removed because it is already defined in<br>_ASTCFLAGS. YY_NO_INPUT is defined so that the compile survives<br>'--enable-dev-mode'.<br><br>Also, a Makefile variable "CROSS_COMPILING" is added so that the<br>build system doesn't try to run check_expr2 when cross-compiling,<br>because that will fail the build as will.<br><br>ASTERISK-28685 #close<br><br>Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net><br>Change-Id: If435b7db9f9ad8266245bda51c81c220f9658915<br>---<br>M configure<br>M configure.ac<br>M makeopts.in<br>M menuselect/configure<br>M utils/Makefile<br>5 files changed, 58 insertions(+), 73 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 0d542bf..ec51ee8 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -1282,6 +1282,7 @@</span><br><span> CXXCPP</span><br><span> ac_ct_CXX</span><br><span> CXXFLAGS</span><br><span style="color: hsl(120, 100%, 40%);">+CROSS_COMPILING</span><br><span> RANLIB</span><br><span> LD</span><br><span> CXX</span><br><span>@@ -1350,7 +1351,6 @@</span><br><span> docdir</span><br><span> oldincludedir</span><br><span> includedir</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir</span><br><span> localstatedir</span><br><span> sharedstatedir</span><br><span> sysconfdir</span><br><span>@@ -1539,7 +1539,6 @@</span><br><span> sysconfdir='${prefix}/etc'</span><br><span> sharedstatedir='${prefix}/com'</span><br><span> localstatedir='${prefix}/var'</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir='${localstatedir}/run'</span><br><span> includedir='${prefix}/include'</span><br><span> oldincludedir='/usr/include'</span><br><span> docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'</span><br><span>@@ -1792,15 +1791,6 @@</span><br><span> | -silent | --silent | --silen | --sile | --sil)</span><br><span> silent=yes ;;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir | --runstatedir | --runstatedi | --runstated \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate | --runstat | --runsta | --runst | --runs \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run | --ru | --r)</span><br><span style="color: hsl(0, 100%, 40%);">- ac_prev=runstatedir ;;</span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run=* | --ru=* | --r=*)</span><br><span style="color: hsl(0, 100%, 40%);">- runstatedir=$ac_optarg ;;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)</span><br><span> ac_prev=sbindir ;;</span><br><span> -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \</span><br><span>@@ -1938,7 +1928,7 @@</span><br><span> for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \</span><br><span> datadir sysconfdir sharedstatedir localstatedir includedir \</span><br><span> oldincludedir docdir infodir htmldir dvidir pdfdir psdir \</span><br><span style="color: hsl(0, 100%, 40%);">- libdir localedir mandir runstatedir</span><br><span style="color: hsl(120, 100%, 40%);">+ libdir localedir mandir</span><br><span> do</span><br><span> eval ac_val=\$$ac_var</span><br><span> # Remove trailing slashes.</span><br><span>@@ -2091,7 +2081,6 @@</span><br><span> --sysconfdir=DIR read-only single-machine data [PREFIX/etc]</span><br><span> --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]</span><br><span> --localstatedir=DIR modifiable single-machine data [PREFIX/var]</span><br><span style="color: hsl(0, 100%, 40%);">- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]</span><br><span> --libdir=DIR object code libraries [EPREFIX/lib]</span><br><span> --includedir=DIR C header files [PREFIX/include]</span><br><span> --oldincludedir=DIR C header files for non-gcc [/usr/include]</span><br><span>@@ -5342,6 +5331,8 @@</span><br><span> RANLIB="$ac_cv_prog_RANLIB"</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ CROSS_COMPILING=1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> fi</span><br><span> </span><br><span> # Checks for programs.</span><br><span>@@ -13644,8 +13635,8 @@</span><br><span> if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEDIT" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for LIBEDIT... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for libedit... " >&6; }</span><br><span> </span><br><span> if test -n "$LIBEDIT_CFLAGS"; then</span><br><span> pkg_cv_LIBEDIT_CFLAGS="$LIBEDIT_CFLAGS"</span><br><span>@@ -13685,7 +13676,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -13706,7 +13697,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_LIBEDIT=0</span><br><span>@@ -14104,8 +14095,8 @@</span><br><span> if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for JANSSON... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.11" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for jansson >= 2.11... " >&6; }</span><br><span> </span><br><span> if test -n "$JANSSON_CFLAGS"; then</span><br><span> pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"</span><br><span>@@ -14145,7 +14136,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -14166,7 +14157,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_JANSSON=0</span><br><span>@@ -14961,7 +14952,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -15007,7 +14998,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -15031,7 +15022,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -15076,7 +15067,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -15100,7 +15091,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -20792,8 +20783,8 @@</span><br><span> if test "x${PBX_ILBC}" != "x1" -a "${USE_ILBC}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ILBC" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for ILBC... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libilbc" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for libilbc... " >&6; }</span><br><span> </span><br><span> if test -n "$ILBC_CFLAGS"; then</span><br><span> pkg_cv_ILBC_CFLAGS="$ILBC_CFLAGS"</span><br><span>@@ -20833,7 +20824,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -20854,7 +20845,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_ILBC=0</span><br><span>@@ -25033,8 +25024,8 @@</span><br><span> if test "x${PBX_PJPROJECT}" != "x1" -a "${USE_PJPROJECT}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PJPROJECT" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for PJPROJECT... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpjproject" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for libpjproject... " >&6; }</span><br><span> </span><br><span> if test -n "$PJPROJECT_CFLAGS"; then</span><br><span> pkg_cv_PJPROJECT_CFLAGS="$PJPROJECT_CFLAGS"</span><br><span>@@ -25074,7 +25065,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -25095,7 +25086,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_PJPROJECT=0</span><br><span>@@ -26284,8 +26275,8 @@</span><br><span> if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for PYTHONDEV... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for python... " >&6; }</span><br><span> </span><br><span> if test -n "$PYTHONDEV_CFLAGS"; then</span><br><span> pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"</span><br><span>@@ -26325,7 +26316,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -26346,7 +26337,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_PYTHONDEV=0</span><br><span>@@ -26470,8 +26461,8 @@</span><br><span> if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for PORTAUDIO... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio-2.0" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for portaudio-2.0... " >&6; }</span><br><span> </span><br><span> if test -n "$PORTAUDIO_CFLAGS"; then</span><br><span> pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"</span><br><span>@@ -26511,7 +26502,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -26532,7 +26523,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_PORTAUDIO=0</span><br><span>@@ -32770,8 +32761,8 @@</span><br><span> if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMIME" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for GMIME... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gmime-$ver" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for gmime-$ver... " >&6; }</span><br><span> </span><br><span> if test -n "$GMIME_CFLAGS"; then</span><br><span> pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS"</span><br><span>@@ -32811,7 +32802,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -32832,7 +32823,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_GMIME=0</span><br><span>@@ -34207,8 +34198,8 @@</span><br><span> if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for GTK2... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for gtk+-2.0... " >&6; }</span><br><span> </span><br><span> if test -n "$GTK2_CFLAGS"; then</span><br><span> pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"</span><br><span>@@ -34248,7 +34239,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -34269,7 +34260,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_GTK2=0</span><br><span>@@ -34318,8 +34309,8 @@</span><br><span> if test "x${PBX_SYSTEMD}" != "x1" -a "${USE_SYSTEMD}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for SYSTEMD... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for libsystemd... " >&6; }</span><br><span> </span><br><span> if test -n "$SYSTEMD_CFLAGS"; then</span><br><span> pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"</span><br><span>@@ -34359,7 +34350,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -34380,7 +34371,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_SYSTEMD=0</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 0a6852a..2cfb9f0 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -230,6 +230,8 @@</span><br><span> AC_CHECK_TOOL(CXX, g++, :)</span><br><span> AC_CHECK_TOOL(LD, ld, :)</span><br><span> AC_CHECK_TOOL(RANLIB, ranlib, :)</span><br><span style="color: hsl(120, 100%, 40%);">+ CROSS_COMPILING=1</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_SUBST(CROSS_COMPILING)</span><br><span> fi</span><br><span> </span><br><span> # Checks for programs.</span><br><span>diff --git a/makeopts.in b/makeopts.in</span><br><span>index cb98726..3580feb 100644</span><br><span>--- a/makeopts.in</span><br><span>+++ b/makeopts.in</span><br><span>@@ -66,6 +66,8 @@</span><br><span> </span><br><span> BIND8_CFLAGS=@BIND8_CFLAGS@</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+CROSS_COMPILING=@CROSS_COMPILING@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> PTHREAD_CFLAGS=@PTHREAD_CFLAGS@</span><br><span> PTHREAD_LIBS=@PTHREAD_LIBS@</span><br><span> </span><br><span>diff --git a/menuselect/configure b/menuselect/configure</span><br><span>index 9986b4f..df7b81e 100755</span><br><span>--- a/menuselect/configure</span><br><span>+++ b/menuselect/configure</span><br><span>@@ -696,7 +696,6 @@</span><br><span> docdir</span><br><span> oldincludedir</span><br><span> includedir</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir</span><br><span> localstatedir</span><br><span> sharedstatedir</span><br><span> sysconfdir</span><br><span>@@ -778,7 +777,6 @@</span><br><span> sysconfdir='${prefix}/etc'</span><br><span> sharedstatedir='${prefix}/com'</span><br><span> localstatedir='${prefix}/var'</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir='${localstatedir}/run'</span><br><span> includedir='${prefix}/include'</span><br><span> oldincludedir='/usr/include'</span><br><span> docdir='${datarootdir}/doc/${PACKAGE}'</span><br><span>@@ -1031,15 +1029,6 @@</span><br><span> | -silent | --silent | --silen | --sile | --sil)</span><br><span> silent=yes ;;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir | --runstatedir | --runstatedi | --runstated \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate | --runstat | --runsta | --runst | --runs \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run | --ru | --r)</span><br><span style="color: hsl(0, 100%, 40%);">- ac_prev=runstatedir ;;</span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run=* | --ru=* | --r=*)</span><br><span style="color: hsl(0, 100%, 40%);">- runstatedir=$ac_optarg ;;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)</span><br><span> ac_prev=sbindir ;;</span><br><span> -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \</span><br><span>@@ -1177,7 +1166,7 @@</span><br><span> for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \</span><br><span> datadir sysconfdir sharedstatedir localstatedir includedir \</span><br><span> oldincludedir docdir infodir htmldir dvidir pdfdir psdir \</span><br><span style="color: hsl(0, 100%, 40%);">- libdir localedir mandir runstatedir</span><br><span style="color: hsl(120, 100%, 40%);">+ libdir localedir mandir</span><br><span> do</span><br><span> eval ac_val=\$$ac_var</span><br><span> # Remove trailing slashes.</span><br><span>@@ -1330,7 +1319,6 @@</span><br><span> --sysconfdir=DIR read-only single-machine data [PREFIX/etc]</span><br><span> --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]</span><br><span> --localstatedir=DIR modifiable single-machine data [PREFIX/var]</span><br><span style="color: hsl(0, 100%, 40%);">- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]</span><br><span> --libdir=DIR object code libraries [EPREFIX/lib]</span><br><span> --includedir=DIR C header files [PREFIX/include]</span><br><span> --oldincludedir=DIR C header files for non-gcc [/usr/include]</span><br><span>@@ -4994,8 +4982,8 @@</span><br><span> if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then</span><br><span> </span><br><span> pkg_failed=no</span><br><span style="color: hsl(0, 100%, 40%);">-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5</span><br><span style="color: hsl(0, 100%, 40%);">-$as_echo_n "checking for GTK2... " >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo_n "checking for gtk+-2.0... " >&6; }</span><br><span> </span><br><span> if test -n "$GTK2_CFLAGS"; then</span><br><span> pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"</span><br><span>@@ -5035,7 +5023,7 @@</span><br><span> </span><br><span> </span><br><span> if test $pkg_failed = yes; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then</span><br><span>@@ -5056,7 +5044,7 @@</span><br><span> </span><br><span> </span><br><span> elif test $pkg_failed = untried; then</span><br><span style="color: hsl(0, 100%, 40%);">- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span> </span><br><span> PBX_GTK2=0</span><br><span>diff --git a/utils/Makefile b/utils/Makefile</span><br><span>index 738d1e4..3a1e218 100644</span><br><span>--- a/utils/Makefile</span><br><span>+++ b/utils/Makefile</span><br><span>@@ -180,14 +180,16 @@</span><br><span> </span><br><span> check_expr2: $(ASTTOPDIR)/main/ast_expr2f.c $(ASTTOPDIR)/main/ast_expr2.c $(ASTTOPDIR)/main/ast_expr2.h astmm.o</span><br><span> $(ECHO_PREFIX) echo " [CC] ast_expr2f.c -> ast_expr2fz.o"</span><br><span style="color: hsl(0, 100%, 40%);">- $(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE $(ASTTOPDIR)/main/ast_expr2f.c -o ast_expr2fz.o</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CC) -g -c -I$(ASTTOPDIR)/include $(_ASTCFLAGS) -DYY_NO_INPUT $(ASTTOPDIR)/main/ast_expr2f.c -o ast_expr2fz.o</span><br><span> $(ECHO_PREFIX) echo " [CC] ast_expr2.c -> ast_expr2z.o"</span><br><span style="color: hsl(0, 100%, 40%);">- $(CC) -g -c -I$(ASTTOPDIR)/include -DSTANDALONE2 $(ASTTOPDIR)/main/ast_expr2.c -o ast_expr2z.o</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CC) -g -c -I$(ASTTOPDIR)/include $(_ASTCFLAGS) -DSTANDALONE2 $(ASTTOPDIR)/main/ast_expr2.c -o ast_expr2z.o</span><br><span> $(ECHO_PREFIX) echo " [LD] ast_expr2fz.o ast_expr2z.o -> check_expr2"</span><br><span> $(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o astmm.o -lm $(_ASTLDFLAGS)</span><br><span> $(ECHO_PREFIX) echo " [RM] ast_expr2fz.o ast_expr2z.o"</span><br><span> rm ast_expr2z.o ast_expr2fz.o</span><br><span style="color: hsl(120, 100%, 40%);">+ifneq ($(CROSS_COMPILING),1)</span><br><span> ./check_expr2 expr2.testinput</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> </span><br><span> smsq: smsq.o strcompat.o</span><br><span> smsq: LIBS+=$(POPT_LIB)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13875">change 13875</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/13875"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: If435b7db9f9ad8266245bda51c81c220f9658915 </div>
<div style="display:none"> Gerrit-Change-Number: 13875 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sebastian Kemper <sebastian_ml@gmx.net> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>