[meta-oe][PATCH 0/6] Various fixes from meta-mentor

[meta-oe][PATCH 0/6] Various fixes from meta-mentor

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Working through my upstream patch submission backlog.

The following changes since commit 37297c3222a40b916d98ccd06b757b595aebc756:

  nbd: fix LIC_FILES_CHKSUM (2016-05-12 11:53:30 -0400)

are available in the git repository at:

  git://github.com/kergoth/meta-openembedded various-mentor-fixes
  https://github.com/kergoth/meta-openembedded/tree/various-mentor-fixes

Christopher Larson (6):
  mg: stop relying on make -e
  luajit: fix build issues, obey more vars
  openlmi-networking: add missing dep on konkretcmpi-native
  networkmanager: add missing dep on intltool-native
  networkmanager: add missing dep on dbus-glib-native
  x11vnc: remove old libtool macros from acinclude.m4

 .../networkmanager/networkmanager_1.0.10.bb        |  2 +-
 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb    | 53 ++++++++++++++++------
 .../openlmi/openlmi-networking_0.3.1.bb            |  2 +-
 meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb   |  6 +++
 meta-oe/recipes-support/mg/mg_20110905.bb          | 12 ++++-
 5 files changed, 59 insertions(+), 16 deletions(-)

-- 
2.8.0

[meta-oe][PATCH 1/6] mg: stop relying on make -e

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Relying on 'make -e' isn't ideal, as it's less implicit behavior, relies on
variable exports, and hides the variables being used from someone reading the
recipe.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-oe/recipes-support/mg/mg_20110905.bb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mg/mg_20110905.bb b/meta-oe/recipes-support/mg/mg_20110905.bb
index e924bbd..95aeb62 100644
--- a/meta-oe/recipes-support/mg/mg_20110905.bb
+++ b/meta-oe/recipes-support/mg/mg_20110905.bb
@@ -11,7 +11,17 @@ SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \
 SRC_URI[md5sum] = "2de35316fa8ebafe6003efaae70b723e"
 SRC_URI[sha256sum] = "1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229"
 
-EXTRA_OEMAKE = "-e MAKEFLAGS="
+# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?=
+EXTRA_OEMAKE = "\
+    'CC=${CC}' \
+    'LDFLAGS=${LDFLAGS}' \
+    \
+    'prefix=${prefix}' \
+    'bindir=${bindir}' \
+    'libdir=${libdir}' \
+    'includedir=${includedir}' \
+    'mandir=${mandir}' \
+"
 
 do_configure () {
     sed -i Makefile.in -e 's,^prefix=.*,prefix=${prefix},'
-- 
2.8.0

[meta-oe][PATCH 2/6] luajit: fix build issues, obey more vars

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Rework how variables are passed in to ensure that more of our flag vars are
obeyed, make it obey more of our target path vars, and use fewer of its
hardcoded flags. Also add verbosity to the compile output for debugging.

Without this, errors were seen for us:

    | In file included from .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/syslimits.h:7:0,
    |                  from .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:34,
    |                  from luaconf.h:12,
    |                  from lua.h:16,
    |                  from lj_arch.h:9:
    | .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:168:61: fatal error: limits.h: No such file or directory
    | compilation terminated.
    | Makefile:233: *** Unsupported target architecture.  Stop.
    | make[1]: Leaving directory '.../luajit/2.0.4-r0/LuaJIT-2.0.4/src'

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 53 +++++++++++++++++++------
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
index a0252aa..66bf3e4 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
@@ -15,11 +15,6 @@ inherit pkgconfig binconfig
 
 BBCLASSEXTEND = "native"
 
-do_configure_prepend() {
-    sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile
-    sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile
-}
-
 # http://luajit.org/install.html#cross
 # Host luajit needs to be compiled with the same pointer size
 # If you want to cross-compile to any 32 bit target on an x64 OS,
@@ -30,20 +25,49 @@ BUILD_CC_ARCH_append_powerpc = ' -m32'
 BUILD_CC_ARCH_append_x86 = ' -m32'
 BUILD_CC_ARCH_append_arm = ' -m32'
 
-EXTRA_OEMAKE_append_class-target = '\
-    CROSS=${HOST_PREFIX} \
-    HOST_CC="${BUILD_CC} ${BUILD_CC_ARCH}" \
-    TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${TARGET_CC_ARCH}" \
-    TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \
-    TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}" \
-'
+# The lua makefiles expect the TARGET_SYS to be from uname -s
+# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD
+LUA_TARGET_OS = "${@'${TARGET_OS}'[0].upper() + '${TARGET_OS}'[1:]}"
+LUA_TARGET_OS_mingw32 = "Windows"
+
+# We don't want the lua buildsystem's compiler optimizations, or its
+# stripping, and we don't want it to pick up CFLAGS or LDFLAGS, as those apply
+# to both host and target compiles
+EXTRA_OEMAKE = "\
+    Q= E='@:' \
+    \
+    CCOPT= CCOPT_x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \
+    \
+    'TARGET_SYS=${LUA_TARGET_OS}' \
+    \
+    'CC=${CC}' \
+    'TARGET_AR=${AR} rcus' \
+    'TARGET_CFLAGS=${CFLAGS}' \
+    'TARGET_LDFLAGS=${LDFLAGS}' \
+    'TARGET_SHLDFLAGS=${LDFLAGS}' \
+    'HOST_CC=${BUILD_CC}' \
+    'HOST_CFLAGS=${BUILD_CFLAGS}' \
+    'HOST_LDFLAGS=${BUILD_LDFLAGS}' \
+    \
+    'PREFIX=${prefix}' \
+    'MULTILIB=${baselib}' \
+"
 
 do_compile () {
     oe_runmake
 }
 
+# There's INSTALL_LIB and INSTALL_SHARE also, but the lua binary hardcodes the
+# '/share' and '/' + LUA_MULTILIB paths, so we don't want to break those
+# expectations.
+EXTRA_OEMAKEINST = "\
+    'DESTDIR=${D}' \
+    'INSTALL_BIN=${D}${bindir}' \
+    'INSTALL_INC=${D}${includedir}/luajit-$(MAJVER).$(MINVER)' \
+    'INSTALL_MAN=${D}${mandir}/man1' \
+"
 do_install () {
-    oe_runmake 'DESTDIR=${D}' install
+    oe_runmake ${EXTRA_OEMAKEINST} install
     rmdir ${D}${datadir}/lua/5.* \
           ${D}${datadir}/lua \
           ${D}${libdir}/lua/5.* \
@@ -52,6 +76,9 @@ do_install () {
 
 PACKAGES += 'luajit-common'
 
+# See the comment for EXTRA_OEMAKEINST. This is needed to ensure the hardcoded
+# paths are packaged regardless of what the libdir and datadir paths are.
+FILES_${PN} += "${prefix}/${baselib} ${prefix}/share"
 FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \
     ${libdir}/libluajit-5.1.so.${PV} \
 "
-- 
2.8.0

[meta-oe][PATCH 3/6] openlmi-networking: add missing dep on konkretcmpi-native

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Without it, we can hit errors like:

    | CMake Error at .../build/tmp/sysroots/qemux86-64/usr/share/cmake/Modules/OpenLMIMacros.cmake:105 (message):
    |   KonkretCMPI failed: No such file or directory

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb b/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
index 5442910..7cfcbe2 100644
--- a/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
+++ b/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.openlmi.org/"
 LICENSE = "LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
 SECTION = "System/Management"
-DEPENDS = "openlmi-providers konkretcmpi sblim-cmpi-devel cim-schema-exper networkmanager dbus libcheck glib-2.0"
+DEPENDS = "openlmi-providers konkretcmpi konkretcmpi-native sblim-cmpi-devel cim-schema-exper networkmanager dbus libcheck glib-2.0"
 
 SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
            file://0001-fix-lib64-can-not-be-shiped-in-64bit-target.patch \
-- 
2.8.0

[meta-oe][PATCH 4/6] networkmanager: add missing dep on intltool-native

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Recipes using intltool need this dependency.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
index 831ddf0..c8447e6 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \
 "
 
-DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt polkit"
+DEPENDS = "intltool-native libnl dbus dbus-glib libgudev util-linux libndp libnewt polkit"
 
 inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
 
-- 
2.8.0

[meta-oe][PATCH 5/6] networkmanager: add missing dep on dbus-glib-native

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

The networkmanager build runs dbus-binding-tool, which only exists if
dbus-glib-native has been built, and will fail otherwise.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
index c8447e6..c18afff 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \
 "
 
-DEPENDS = "intltool-native libnl dbus dbus-glib libgudev util-linux libndp libnewt polkit"
+DEPENDS = "intltool-native libnl dbus dbus-glib dbus-glib-native libgudev util-linux libndp libnewt polkit"
 
 inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
 
-- 
2.8.0

[meta-oe][PATCH 6/6] x11vnc: remove old libtool macros from acinclude.m4

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

These can cause build problems. We only want macros in acinclude.m4 which
aren't available for aclocal to get elsewhere.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index 7e92965..64c8a5d 100644
--- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -24,3 +24,9 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi',
 PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
 PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
 PACKAGECONFIG[libvncserver] = "--with-system-libvncserver,--without-system-libvncserver,libvncserver"
+
+do_prepare_sources () {
+    # Remove old libtool macros from acinclude.m4
+    sed -i -e '/^# libtool.m4/q' acinclude.m4
+}
+do_patch[postfuncs] += "do_prepare_sources"
-- 
2.8.0

Re: [meta-oe][PATCH 1/6] mg: stop relying on make -e

[Christopher Larson]

On Tue, May 17, 2016 at 9:10 AM, Christopher Larson <kergoth@gmail.com>
wrote:

> From: Christopher Larson <chris_larson@mentor.com>
>
> Relying on 'make -e' isn't ideal, as it's less implicit behavior, relies on
> variable exports, and hides the variables being used from someone reading
> the
> recipe.
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>


Erm, clearly meant 'explicit' here :)
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [meta-oe][PATCH 2/6] luajit: fix build issues, obey more vars

[Christopher Larson]

On Tue, May 17, 2016 at 9:10 AM, Christopher Larson <kergoth@gmail.com>
wrote:

> From: Christopher Larson <chris_larson@mentor.com>
>
> Rework how variables are passed in to ensure that more of our flag vars are
> obeyed, make it obey more of our target path vars, and use fewer of its
> hardcoded flags. Also add verbosity to the compile output for debugging.
>
> Without this, errors were seen for us:
>
>     | In file included from
> .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/syslimits.h:7:0,
>     |                  from
> .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:34,
>     |                  from luaconf.h:12,
>     |                  from lua.h:16,
>     |                  from lj_arch.h:9:
>     |
> .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:168:61:
> fatal error: limits.h: No such file or directory
>     | compilation terminated.
>     | Makefile:233: *** Unsupported target architecture.  Stop.
>     | make[1]: Leaving directory '.../luajit/2.0.4-r0/LuaJIT-2.0.4/src'
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>

Were there issues with this one? I noticed the other patches in this series
were applied, but this one wasn't.
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [meta-oe][PATCH 2/6] luajit: fix build issues, obey more vars

[Christopher Larson]

On Sat, May 28, 2016 at 8:41 PM, Christopher Larson <chris_larson@mentor.com
> wrote:

> On Tue, May 17, 2016 at 9:10 AM, Christopher Larson <kergoth@gmail.com>
> wrote:
>
>> From: Christopher Larson <chris_larson@mentor.com>
>>
>> Rework how variables are passed in to ensure that more of our flag vars
>> are
>> obeyed, make it obey more of our target path vars, and use fewer of its
>> hardcoded flags. Also add verbosity to the compile output for debugging.
>>
>> Without this, errors were seen for us:
>>
>>     | In file included from
>> .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/syslimits.h:7:0,
>>     |                  from
>> .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:34,
>>     |                  from luaconf.h:12,
>>     |                  from lua.h:16,
>>     |                  from lj_arch.h:9:
>>     |
>> .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:168:61:
>> fatal error: limits.h: No such file or directory
>>     | compilation terminated.
>>     | Makefile:233: *** Unsupported target architecture.  Stop.
>>     | make[1]: Leaving directory '.../luajit/2.0.4-r0/LuaJIT-2.0.4/src'
>>
>> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>>
>
> Were there issues with this one? I noticed the other patches in this
> series were applied, but this one wasn't.
>

Ah, nevermind, I see it's on master-next.
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [meta-oe][PATCH 2/6] luajit: fix build issues, obey more vars

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]

On Sat, May 28, 2016 at 08:41:16PM -0700, Christopher Larson wrote:
> On Tue, May 17, 2016 at 9:10 AM, Christopher Larson <kergoth@gmail.com>
> wrote:
> 
> > From: Christopher Larson <chris_larson@mentor.com>
> >
> > Rework how variables are passed in to ensure that more of our flag vars are
> > obeyed, make it obey more of our target path vars, and use fewer of its
> > hardcoded flags. Also add verbosity to the compile output for debugging.
> >
> > Without this, errors were seen for us:
> >
> >     | In file included from
> > .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/syslimits.h:7:0,
> >     |                  from
> > .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:34,
> >     |                  from luaconf.h:12,
> >     |                  from lua.h:16,
> >     |                  from lj_arch.h:9:
> >     |
> > .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:168:61:
> > fatal error: limits.h: No such file or directory
> >     | compilation terminated.
> >     | Makefile:233: *** Unsupported target architecture.  Stop.
> >     | make[1]: Leaving directory '.../luajit/2.0.4-r0/LuaJIT-2.0.4/src'
> >
> > Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> >
> 
> Were there issues with this one? I noticed the other patches in this series
> were applied, but this one wasn't.

I've seen some luajit failures, but haven't confirmed if it was
caused/related to this change yet, so I've kept it in master-next for a
bit longer until I find time to confirm it.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-oe][PATCH 2/6] luajit: fix build issues, obey more vars

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1952 bytes --]

On Mon, May 30, 2016 at 11:44:19AM +0200, Martin Jansa wrote:
> On Sat, May 28, 2016 at 08:41:16PM -0700, Christopher Larson wrote:
> > On Tue, May 17, 2016 at 9:10 AM, Christopher Larson <kergoth@gmail.com>
> > wrote:
> > 
> > > From: Christopher Larson <chris_larson@mentor.com>
> > >
> > > Rework how variables are passed in to ensure that more of our flag vars are
> > > obeyed, make it obey more of our target path vars, and use fewer of its
> > > hardcoded flags. Also add verbosity to the compile output for debugging.
> > >
> > > Without this, errors were seen for us:
> > >
> > >     | In file included from
> > > .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/syslimits.h:7:0,
> > >     |                  from
> > > .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:34,
> > >     |                  from luaconf.h:12,
> > >     |                  from lua.h:16,
> > >     |                  from lj_arch.h:9:
> > >     |
> > > .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:168:61:
> > > fatal error: limits.h: No such file or directory
> > >     | compilation terminated.
> > >     | Makefile:233: *** Unsupported target architecture.  Stop.
> > >     | make[1]: Leaving directory '.../luajit/2.0.4-r0/LuaJIT-2.0.4/src'
> > >
> > > Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> > >
> > 
> > Were there issues with this one? I noticed the other patches in this series
> > were applied, but this one wasn't.
> 
> I've seen some luajit failures, but haven't confirmed if it was
> caused/related to this change yet, so I've kept it in master-next for a
> bit longer until I find time to confirm it.

FWIW: this is the one I was seeing (now reproduced in public build so
that I can actually share the log).
http://errors.yoctoproject.org/Errors/Details/68382/

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

[meta-oe][PATCHv2] luajit: fix build issues, obey more vars

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

Rework how variables are passed in to ensure that more of our flag vars are
obeyed, make it obey more of our target path vars, and use fewer of its
hardcoded flags. Also add verbosity to the compile output for debugging.

Without this, errors were seen for us:

    | In file included from .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/syslimits.h:7:0,
    |                  from .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:34,
    |                  from luaconf.h:12,
    |                  from lua.h:16,
    |                  from lj_arch.h:9:
    | .../lib/gcc/i686-pc-linux-gnu/5.2.0/include-fixed/64/sgxx-glibc/limits.h:168:61: fatal error: limits.h: No such file or directory
    | compilation terminated.
    | Makefile:233: *** Unsupported target architecture.  Stop.
    | make[1]: Leaving directory '.../luajit/2.0.4-r0/LuaJIT-2.0.4/src'

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
v2 changes: fixed http://errors.yoctoproject.org/Errors/Details/68382/ by
ensuring LUA_TARGET_OS is correct. The lua buildsystem didn't recognize the os
with the LIBCEXTENSION+ABIEXTENSION.

 meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb | 56 +++++++++++++++++++------
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
index a0252aa..964dc1d 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb
@@ -15,11 +15,6 @@ inherit pkgconfig binconfig
 
 BBCLASSEXTEND = "native"
 
-do_configure_prepend() {
-    sed -i 's:PREFIX= /usr/local:PREFIX= ${prefix}:g' ${S}/Makefile
-    sed -i 's:MULTILIB= lib:MULTILIB= ${baselib}:g' ${S}/Makefile
-}
-
 # http://luajit.org/install.html#cross
 # Host luajit needs to be compiled with the same pointer size
 # If you want to cross-compile to any 32 bit target on an x64 OS,
@@ -30,20 +25,52 @@ BUILD_CC_ARCH_append_powerpc = ' -m32'
 BUILD_CC_ARCH_append_x86 = ' -m32'
 BUILD_CC_ARCH_append_arm = ' -m32'
 
-EXTRA_OEMAKE_append_class-target = '\
-    CROSS=${HOST_PREFIX} \
-    HOST_CC="${BUILD_CC} ${BUILD_CC_ARCH}" \
-    TARGET_CFLAGS="${TOOLCHAIN_OPTIONS} ${TARGET_CC_ARCH}" \
-    TARGET_LDFLAGS="${TOOLCHAIN_OPTIONS}" \
-    TARGET_SHLDFLAGS="${TOOLCHAIN_OPTIONS}" \
-'
+# The lua makefiles expect the TARGET_SYS to be from uname -s
+# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD
+LUA_TARGET_OS = "Unknown"
+LUA_TARGET_OS_darwin = "Darwin"
+LUA_TARGET_OS_linux = "Linux"
+LUA_TARGET_OS_linux-gnueabi = "Linux"
+LUA_TARGET_OS_mingw32 = "Windows"
+
+# We don't want the lua buildsystem's compiler optimizations, or its
+# stripping, and we don't want it to pick up CFLAGS or LDFLAGS, as those apply
+# to both host and target compiles
+EXTRA_OEMAKE = "\
+    Q= E='@:' \
+    \
+    CCOPT= CCOPT_x86= CFLAGS= LDFLAGS= TARGET_STRIP='@:' \
+    \
+    'TARGET_SYS=${LUA_TARGET_OS}' \
+    \
+    'CC=${CC}' \
+    'TARGET_AR=${AR} rcus' \
+    'TARGET_CFLAGS=${CFLAGS}' \
+    'TARGET_LDFLAGS=${LDFLAGS}' \
+    'TARGET_SHLDFLAGS=${LDFLAGS}' \
+    'HOST_CC=${BUILD_CC}' \
+    'HOST_CFLAGS=${BUILD_CFLAGS}' \
+    'HOST_LDFLAGS=${BUILD_LDFLAGS}' \
+    \
+    'PREFIX=${prefix}' \
+    'MULTILIB=${baselib}' \
+"
 
 do_compile () {
     oe_runmake
 }
 
+# There's INSTALL_LIB and INSTALL_SHARE also, but the lua binary hardcodes the
+# '/share' and '/' + LUA_MULTILIB paths, so we don't want to break those
+# expectations.
+EXTRA_OEMAKEINST = "\
+    'DESTDIR=${D}' \
+    'INSTALL_BIN=${D}${bindir}' \
+    'INSTALL_INC=${D}${includedir}/luajit-$(MAJVER).$(MINVER)' \
+    'INSTALL_MAN=${D}${mandir}/man1' \
+"
 do_install () {
-    oe_runmake 'DESTDIR=${D}' install
+    oe_runmake ${EXTRA_OEMAKEINST} install
     rmdir ${D}${datadir}/lua/5.* \
           ${D}${datadir}/lua \
           ${D}${libdir}/lua/5.* \
@@ -52,6 +79,9 @@ do_install () {
 
 PACKAGES += 'luajit-common'
 
+# See the comment for EXTRA_OEMAKEINST. This is needed to ensure the hardcoded
+# paths are packaged regardless of what the libdir and datadir paths are.
+FILES_${PN} += "${prefix}/${baselib} ${prefix}/share"
 FILES_${PN} += "${libdir}/libluajit-5.1.so.2 \
     ${libdir}/libluajit-5.1.so.${PV} \
 "
-- 
2.8.0