mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 06:48:25 +00:00
detect ARM Linux EABI OSARCH as linux-gnu instead of linux-gnueabi
* Set OSARCH to linux-gnu even if host_os is linux-gnueabi
* When checking if we are Linux, check OSARCH rather than host_os
The newer ARM ABI ("EABI") shows the OS name 'linux-gnueabi' rather than
'linux-gnu' . This patch sets OSARCH to be 'linux-gnu' even in such a case.
OSARCH is tested for the value of 'linux-gnu' in one or two places in the
tree. This patch also fixes the check libcap to check for $OSARCH rather
than $host_os .
See also: http://wiki.debian.org/ArmEabiPort
Merged revisions 225957 via svnmerge from
http://svn.digium.com/svn/asterisk/branches/1.4
Merged revisions 226018 via svnmerge from
http://svn.digium.com/svn/asterisk/trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@226053 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
7
configure
vendored
7
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.ac Revision: 217076 .
|
||||
# From configure.ac Revision: 217642 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||
#
|
||||
@@ -4149,6 +4149,9 @@ case "${host_os}" in
|
||||
OSARCH=cygwin
|
||||
WINARCH=1
|
||||
;;
|
||||
linux-gnueabi)
|
||||
OSARCH=linux-gnu
|
||||
;;
|
||||
*)
|
||||
OSARCH=${host_os}
|
||||
;;
|
||||
@@ -20209,7 +20212,7 @@ _ACEOF
|
||||
fi
|
||||
|
||||
|
||||
if test "x${host_os}" = "xlinux-gnu" ; then
|
||||
if test "x${OSARCH}" = "xlinux-gnu" ; then
|
||||
|
||||
if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then
|
||||
pbxlibdir=""
|
||||
|
||||
@@ -109,6 +109,9 @@ case "${host_os}" in
|
||||
OSARCH=cygwin
|
||||
WINARCH=1
|
||||
;;
|
||||
linux-gnueabi)
|
||||
OSARCH=linux-gnu
|
||||
;;
|
||||
*)
|
||||
OSARCH=${host_os}
|
||||
;;
|
||||
@@ -634,7 +637,7 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -l
|
||||
|
||||
AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
|
||||
|
||||
if test "x${host_os}" = "xlinux-gnu" ; then
|
||||
if test "x${OSARCH}" = "xlinux-gnu" ; then
|
||||
AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user