man: use BUILD_CC and target include files for configure

The configure script was using the cross-compiler for feature tests,
which fails to execute when the target is different than the host.
Change the script to use the build compiler instead, but use the
target include files to check for the target features.

[YOCTO #9359]

(From OE-Core rev: c0e0d061d94a1ed2930cbf9a9445cf8cb9f4f9b3)

Signed-off-by: Bill Randle <william.c.randle@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bill Randle 2016-03-30 22:11:35 -07:00 committed by Richard Purdie
parent 51217057d1
commit 5293b834c1
2 changed files with 69 additions and 0 deletions

View File

@ -0,0 +1,68 @@
Use BUILD_CC and target include files for configuration tests.
If cross-compiling, force pathnames for helper programs, since
autodiscovery by the configure script will not work.
Upstream-Status: Pending
Signed-off-by: Bill Randle <william.c.randle at intel.com>
--- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700
+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700
@@ -216,7 +216,8 @@
INCLUDEDIR=${INCLUDEDIR-/usr/include}
rm -f conftest conftest.c
-compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
+# since we are interested in target feature support, use that sysroot
+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
# Check for various header files.
@@ -455,19 +456,23 @@
fi
done
done
- Fgroff=/usr/bin/groff
- Fnroff=/usr/bin/nroff
- Fjnroff=/usr/bin/nroff
- Fgeqn=/usr/bin/geqn
- Fgtbl=/usr/bin/gtbl
- Fcol=/usr/bin/col
- Fgrefer=/usr/bin/grefer
- Fgpic=/usr/bin/gpic
- Fmore=/bin/more
- Fless=/usr/bin/less
- Fcmp=/usr/bin/cmp
- Fcat=/bin/cat
- Fgawk=/bin/gawk
+ if [ $BUILD_CC != $CC ]; then
+ # cross compiling => target fs not available, so force defaults
+ Fgroff=/usr/bin/groff
+ Fnroff=/usr/bin/nroff
+ Fjnroff=/usr/bin/nroff
+ Fgeqn=/usr/bin/eqn
+ Fgneqn=/usr/bin/neqn
+ Fgtbl=/usr/bin/tbl
+ Fcol=/usr/bin/col
+ Fgrefer=/usr/bin/refer
+ Fgpic=/usr/bin/pic
+ Fmore=/bin/more
+ Fless=/usr/bin/less
+ Fcmp=/usr/bin/cmp
+ Fcat=/bin/cat
+ Fgawk=/usr/bin/gawk
+ fi
for i in eqn tbl refer pic
@@ -507,8 +512,8 @@
jnroff="$Fjnroff -Tutf8 -mandocj"
fi
eqn="$Fgeqn -Tps"
- neqn="$Fgeqn -Tutf8"
- jneqn="$Fgeqn -Tutf8"
+ neqn="$Fgneqn -Tutf8"
+ jneqn="$Fgneqn -Tutf8"
tbl="$Fgtbl"
col="$Fcol"
vgrind="$Fvgrind"

View File

@ -54,6 +54,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba
file://configure_sed.patch \
file://man-1.6g-parallel.patch \
file://man-1.6g-compile-warnings.patch \
file://man-1.6g-configure.patch \
"
SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"