diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch new file mode 100644 index 000000000..106cc9878 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/man/man/man-1.6g-configure.patch @@ -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" |