6a16e1631f
I re-did the patches: one patch per change, patch configure.in instead of the configure script itself, a few more issues fixed. This should hopefully make the patches acceptable for upstream, or at least make it easier to migrate them on version bumps. This also fixes compilation with musl libc. Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
131 lines
3.4 KiB
Diff
131 lines
3.4 KiB
Diff
From: Maarten ter Huurne <maarten@treewalker.org>
|
|
Date: Sun, 14 Sep 2014 07:10:59 +0200
|
|
Subject: When cross-compiling, skip checks that look in the host file system
|
|
|
|
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
|
|
---
|
|
configure.in | 23 +++++++++++++++++++----
|
|
1 file changed, 19 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index d53a079..79aa56d 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -84,7 +84,7 @@ AC_ARG_ENABLE(socket-dir,
|
|
dnl
|
|
dnl **** special unix variants ****
|
|
dnl
|
|
-if test -n "$ISC"; then
|
|
+if test "$cross_compiling" = no && test -n "$ISC" ; then
|
|
AC_DEFINE(ISC) LIBS="$LIBS -linet"
|
|
fi
|
|
|
|
@@ -95,10 +95,11 @@ dnl AC_DEFINE(OSF1) # this disables MIPS again....
|
|
dnl fi
|
|
dnl fi
|
|
|
|
-if test -f /sysV68 ; then
|
|
+if test "$cross_compiling" = no && test -f /sysV68 ; then
|
|
AC_DEFINE(sysV68)
|
|
fi
|
|
|
|
+if test "$cross_compiling" = no ; then
|
|
AC_CHECKING(for MIPS)
|
|
if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then
|
|
oldlibs="$LIBS"
|
|
@@ -122,6 +123,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd"
|
|
))
|
|
fi
|
|
fi
|
|
+fi
|
|
|
|
|
|
AC_CHECKING(for Ultrix)
|
|
@@ -131,7 +133,7 @@ AC_EGREP_CPP(yes,
|
|
#endif
|
|
], ULTRIX=1)
|
|
|
|
-if test -f /usr/lib/libpyr.a ; then
|
|
+if test "$cross_compiling" = no && test -f /usr/lib/libpyr.a ; then
|
|
oldlibs="$LIBS"
|
|
LIBS="$LIBS -lpyr"
|
|
AC_CHECKING(Pyramid OSX)
|
|
@@ -678,17 +680,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
|
|
dnl
|
|
dnl **** PTY specific things ****
|
|
dnl
|
|
+if test "$cross_compiling" = no ; then
|
|
AC_CHECKING(for /dev/ptc)
|
|
if test -r /dev/ptc; then
|
|
AC_DEFINE(HAVE_DEV_PTC)
|
|
fi
|
|
+fi
|
|
|
|
+if test "$cross_compiling" = no ; then
|
|
AC_CHECKING(for SVR4 ptys)
|
|
sysvr4ptys=
|
|
if test -c /dev/ptmx ; then
|
|
AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
|
|
sysvr4ptys=1])
|
|
fi
|
|
+fi
|
|
|
|
AC_CHECK_FUNCS(getpt)
|
|
|
|
@@ -698,6 +704,7 @@ AC_CHECK_FUNCS(openpty,,
|
|
[AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])])
|
|
fi
|
|
|
|
+if test "$cross_compiling" = no ; then
|
|
AC_CHECKING(for ptyranges)
|
|
if test -d /dev/ptym ; then
|
|
pdir='/dev/ptym'
|
|
@@ -721,6 +728,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\
|
|
AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
|
|
AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
|
|
fi
|
|
+fi
|
|
|
|
dnl **** pty mode/group handling ****
|
|
dnl
|
|
@@ -868,14 +876,16 @@ fi
|
|
dnl
|
|
dnl **** loadav ****
|
|
dnl
|
|
+if test "$cross_compiling" = no ; then
|
|
AC_CHECKING(for libutil(s))
|
|
test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
|
|
test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
|
|
+fi
|
|
|
|
AC_CHECKING(getloadavg)
|
|
AC_TRY_LINK(,[getloadavg((double *)0, 0);],
|
|
AC_DEFINE(LOADAV_GETLOADAVG) load=1,
|
|
-if test -f /usr/lib/libkvm.a ; then
|
|
+if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then
|
|
olibs="$LIBS"
|
|
LIBS="$LIBS -lkvm"
|
|
AC_CHECKING(getloadavg with -lkvm)
|
|
@@ -1093,13 +1103,18 @@ dnl **** libraries ****
|
|
dnl
|
|
|
|
AC_CHECKING(for crypt and sec libraries)
|
|
+if test "$cross_compiling" = no ; then
|
|
test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d"
|
|
+fi
|
|
oldlibs="$LIBS"
|
|
LIBS="$LIBS -lcrypt"
|
|
AC_CHECKING(crypt)
|
|
AC_TRY_LINK(,,,LIBS="$oldlibs")
|
|
+if test "$cross_compiling" = no ; then
|
|
test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
|
|
test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
|
|
+fi
|
|
+
|
|
oldlibs="$LIBS"
|
|
LIBS="$LIBS -lsun"
|
|
AC_CHECKING(IRIX sun library)
|
|
--
|
|
1.8.4.5
|
|
|