mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 17:32:36 +00:00
linuxptp: Fix cross build
Adjust incdefs.sh to use cross tools to poke for system functionality Re-enable using incdefs.sh export KBUILD_OUTPUT to point to recipe sysroot (From meta-oe rev: b6022761d6880382c5e6ffa4b3dc6f1ec2ae1e73) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Denys Dmytriyenko <denis@denix.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
f81318a4f8
commit
11eae11452
@ -0,0 +1,26 @@
|
|||||||
|
From 8a4cad5e2f2cbb6a34bdc6e877fe499502b8c4c8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
|
||||||
|
Date: Fri, 23 Dec 2016 18:12:29 +0100
|
||||||
|
Subject: [PATCH] linuxptp: Use cross cpp in incdefs
|
||||||
|
|
||||||
|
Use cross cpp incdefs.sh shell script since we are doing cross compiling
|
||||||
|
we need to ensure we use correct setttings from toolchain
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE-Specific]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
|
||||||
|
makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/incdefs.sh
|
||||||
|
+++ b/incdefs.sh
|
||||||
|
@@ -27,7 +27,7 @@ user_flags()
|
||||||
|
printf " -D_GNU_SOURCE"
|
||||||
|
|
||||||
|
# Get list of directories searched for header files.
|
||||||
|
- dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /")
|
||||||
|
+ dirs=$(${CPP} -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /")
|
||||||
|
|
||||||
|
# Look for clock_adjtime().
|
||||||
|
for d in $dirs; do
|
||||||
@ -1,29 +0,0 @@
|
|||||||
From 8a4cad5e2f2cbb6a34bdc6e877fe499502b8c4c8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
|
|
||||||
Date: Fri, 23 Dec 2016 18:12:29 +0100
|
|
||||||
Subject: [PATCH] linuxptp: no incdefs using host headers
|
|
||||||
|
|
||||||
Avoid using host headers via incdefs.sh shell script.
|
|
||||||
|
|
||||||
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/makefile b/makefile
|
|
||||||
index 8cdbd15..85174b8 100644
|
|
||||||
--- a/makefile
|
|
||||||
+++ b/makefile
|
|
||||||
@@ -33,7 +33,7 @@ OBJECTS = $(OBJ) hwstamp_ctl.o phc2sys.o phc_ctl.o pmc.o pmc_common.o \
|
|
||||||
SRC = $(OBJECTS:.o=.c)
|
|
||||||
DEPEND = $(OBJECTS:.o=.d)
|
|
||||||
srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
|
|
||||||
-incdefs := $(shell $(srcdir)/incdefs.sh)
|
|
||||||
+#incdefs := $(shell $(srcdir)/incdefs.sh)
|
|
||||||
version := $(shell $(srcdir)/version.sh $(srcdir))
|
|
||||||
VPATH = $(srcdir)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.9.3
|
|
||||||
|
|
||||||
@ -4,15 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
|||||||
|
|
||||||
SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
|
SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
|
||||||
file://build-Allow-CC-and-prefix-to-be-overriden.patch \
|
file://build-Allow-CC-and-prefix-to-be-overriden.patch \
|
||||||
file://no-incdefs-using-host-headers.patch \
|
file://Use-cross-cpp-in-incdefs.patch \
|
||||||
file://time_t_maybe_long_long.patch \
|
file://time_t_maybe_long_long.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"
|
SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"
|
||||||
SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d"
|
SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d"
|
||||||
|
|
||||||
EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \
|
EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'"
|
||||||
EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'"
|
|
||||||
|
export KBUILD_OUTPUT="${RECIPE_SYSROOT}"
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
install -d ${D}/${bindir}
|
install -d ${D}/${bindir}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user