<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6042">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">corosync: Fix corosync library name in configure.ac<br><br>Also add new corosync packages to install_prereq.<br><br>Reported by Travis Ryan in #asterisk-dev<br><br>Change-Id: Ib861c95ba630fed62dc54e56784ad8446ed9d2db<br>---<br>M configure<br>M configure.ac<br>M contrib/scripts/install_prereq<br>3 files changed, 22 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 456d1f8..5507d87 100755<br>--- a/configure<br>+++ b/configure<br>@@ -1344,6 +1344,7 @@<br> docdir<br> oldincludedir<br> includedir<br>+runstatedir<br> localstatedir<br> sharedstatedir<br> sysconfdir<br>@@ -1525,6 +1526,7 @@<br> sysconfdir='${prefix}/etc'<br> sharedstatedir='${prefix}/com'<br> localstatedir='${prefix}/var'<br>+runstatedir='${localstatedir}/run'<br> includedir='${prefix}/include'<br> oldincludedir='/usr/include'<br> docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'<br>@@ -1777,6 +1779,15 @@<br> | -silent | --silent | --silen | --sile | --sil)<br> silent=yes ;;<br> <br>+ -runstatedir | --runstatedir | --runstatedi | --runstated \<br>+ | --runstate | --runstat | --runsta | --runst | --runs \<br>+ | --run | --ru | --r)<br>+ ac_prev=runstatedir ;;<br>+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \<br>+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \<br>+ | --run=* | --ru=* | --r=*)<br>+ runstatedir=$ac_optarg ;;<br>+<br> -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)<br> ac_prev=sbindir ;;<br> -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \<br>@@ -1914,7 +1925,7 @@<br> for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \<br> datadir sysconfdir sharedstatedir localstatedir includedir \<br> oldincludedir docdir infodir htmldir dvidir pdfdir psdir \<br>- libdir localedir mandir<br>+ libdir localedir mandir runstatedir<br> do<br> eval ac_val=\$$ac_var<br> # Remove trailing slashes.<br>@@ -2067,6 +2078,7 @@<br> --sysconfdir=DIR read-only single-machine data [PREFIX/etc]<br> --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]<br> --localstatedir=DIR modifiable single-machine data [PREFIX/var]<br>+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]<br> --libdir=DIR object code libraries [EPREFIX/lib]<br> --includedir=DIR C header files [PREFIX/include]<br> --oldincludedir=DIR C header files for non-gcc [/usr/include]<br>@@ -14762,7 +14774,7 @@<br> We can't simply define LARGE_OFF_T to be 9223372036854775807,<br> since some C++ compilers masquerading as C compilers<br> incorrectly reject 9223372036854775807. */<br>-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))<br>+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))<br> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721<br> && LARGE_OFF_T % 2147483647 == 1)<br> ? 1 : -1];<br>@@ -14808,7 +14820,7 @@<br> We can't simply define LARGE_OFF_T to be 9223372036854775807,<br> since some C++ compilers masquerading as C compilers<br> incorrectly reject 9223372036854775807. */<br>-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))<br>+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))<br> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721<br> && LARGE_OFF_T % 2147483647 == 1)<br> ? 1 : -1];<br>@@ -14832,7 +14844,7 @@<br> We can't simply define LARGE_OFF_T to be 9223372036854775807,<br> since some C++ compilers masquerading as C compilers<br> incorrectly reject 9223372036854775807. */<br>-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))<br>+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))<br> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721<br> && LARGE_OFF_T % 2147483647 == 1)<br> ? 1 : -1];<br>@@ -14877,7 +14889,7 @@<br> We can't simply define LARGE_OFF_T to be 9223372036854775807,<br> since some C++ compilers masquerading as C compilers<br> incorrectly reject 9223372036854775807. */<br>-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))<br>+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))<br> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721<br> && LARGE_OFF_T % 2147483647 == 1)<br> ? 1 : -1];<br>@@ -14901,7 +14913,7 @@<br> We can't simply define LARGE_OFF_T to be 9223372036854775807,<br> since some C++ compilers masquerading as C compilers<br> incorrectly reject 9223372036854775807. */<br>-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))<br>+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))<br> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721<br> && LARGE_OFF_T % 2147483647 == 1)<br> ? 1 : -1];<br>@@ -31344,7 +31356,7 @@<br> $as_echo_n "(cached) " >&6<br> else<br> ac_check_lib_save_LIBS=$LIBS<br>-LIBS="-lcpg ${pbxlibdir} -lcfg $LIBS"<br>+LIBS="-lcpg ${pbxlibdir} -lcpg $LIBS"<br> cat confdefs.h - <<_ACEOF >conftest.$ac_ext<br> /* end confdefs.h. */<br> <br>@@ -31386,7 +31398,7 @@<br> <br> # now check for the header.<br> if test "${AST_COROSYNC_FOUND}" = "yes"; then<br>- COROSYNC_LIB="${pbxlibdir} -lcpg -lcfg"<br>+ COROSYNC_LIB="${pbxlibdir} -lcpg -lcpg"<br> # if --with-COROSYNC=DIR has been specified, use it.<br> if test "x${COROSYNC_DIR}" != "x"; then<br> COROSYNC_INCLUDE="-I${COROSYNC_DIR}/include"<br>diff --git a/configure.ac b/configure.ac<br>index ebf416c..bf875a2 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -2378,7 +2378,7 @@<br> AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])<br> fi<br> <br>-AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcfg])<br>+AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcpg])<br> AST_EXT_LIB_CHECK([COROSYNC_CFG_STATE_TRACK], [cfg], [corosync_cfg_state_track], [corosync/cfg.h], [-lcfg])<br> <br> AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])<br>diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq<br>index fb24089..d69f552 100755<br>--- a/contrib/scripts/install_prereq<br>+++ b/contrib/scripts/install_prereq<br>@@ -26,7 +26,7 @@<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libcurl-dev libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libsqlite0-dev libmysqlclient15-dev libneon27-dev libgmime-dev libusb-dev liblua5.1-0-dev lua5.1"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libopenh323-dev libvpb-dev libgtk2.0-dev libmysqlclient-dev libbluetooth-dev libradiusclient-ng-dev freetds-dev"<br>-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev libjack-dev"<br>+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-dev libcpg-dev libcfg-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev libjack-dev"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample-dev libc-client-dev binutils-dev libsrtp-dev libgsm1-dev libedit-dev doxygen libjansson-dev libldap-dev"<br> PACKAGES_DEBIAN="$PACKAGES_DEBIAN subversion git libxslt1-dev automake libsrtp-dev libncurses5-dev python-dev"<br> PACKAGES_RH="automake bzip2 gcc gcc-c++ patch ncurses-devel openssl-devel libxml2-devel unixODBC-devel libcurl-devel libogg-devel libvorbis-devel speex-devel"<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6042">change 6042</a>. To unsubscribe, 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/6042"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 14 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib861c95ba630fed62dc54e56784ad8446ed9d2db </div>
<div style="display:none"> Gerrit-Change-Number: 6042 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>