* [dunfell][PATCH] linuxptp: Fix cross build
@ 2021-05-03 21:56 Denys Dmytriyenko
2021-05-17 16:46 ` Denys Dmytriyenko
0 siblings, 1 reply; 4+ messages in thread
From: Denys Dmytriyenko @ 2021-05-03 21:56 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj, Denys Dmytriyenko
From: Khem Raj <raj.khem@gmail.com>
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>
---
.../linuxptp/Use-cross-cpp-in-incdefs.patch | 26 +++++++++++++++++++
| 29 ----------------------
.../recipes-connectivity/linuxptp/linuxptp_2.0.bb | 7 +++---
3 files changed, 30 insertions(+), 32 deletions(-)
create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
delete mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
new file mode 100644
index 0000000..8760886
--- /dev/null
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
@@ -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
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
deleted file mode 100644
index 02dbb23..0000000
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
+++ /dev/null
@@ -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
-
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
index 930c667..e80abc7 100644
--- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
+++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
@@ -4,15 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
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 \
"
SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"
SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d"
-EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \
- EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'"
+EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'"
+
+export KBUILD_OUTPUT="${RECIPE_SYSROOT}"
do_install () {
install -d ${D}/${bindir}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [dunfell][PATCH] linuxptp: Fix cross build
2021-05-03 21:56 [dunfell][PATCH] linuxptp: Fix cross build Denys Dmytriyenko
@ 2021-05-17 16:46 ` Denys Dmytriyenko
2021-05-22 23:16 ` Armin Kuster
0 siblings, 1 reply; 4+ messages in thread
From: Denys Dmytriyenko @ 2021-05-17 16:46 UTC (permalink / raw)
To: openembedded-devel; +Cc: Khem Raj, Armin Kuster
ping.
On Mon, May 03, 2021 at 05:56:00PM -0400, Denys Dmytriyenko wrote:
> From: Khem Raj <raj.khem@gmail.com>
>
> 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>
> ---
> .../linuxptp/Use-cross-cpp-in-incdefs.patch | 26 +++++++++++++++++++
> .../linuxptp/no-incdefs-using-host-headers.patch | 29 ----------------------
> .../recipes-connectivity/linuxptp/linuxptp_2.0.bb | 7 +++---
> 3 files changed, 30 insertions(+), 32 deletions(-)
> create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
> delete mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
>
> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
> new file mode 100644
> index 0000000..8760886
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
> @@ -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
> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
> deleted file mode 100644
> index 02dbb23..0000000
> --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
> +++ /dev/null
> @@ -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
> -
> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
> index 930c667..e80abc7 100644
> --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
> +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
> @@ -4,15 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
> SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
> 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 \
> "
>
> SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"
> SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d"
>
> -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \
> - EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'"
> +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'"
> +
> +export KBUILD_OUTPUT="${RECIPE_SYSROOT}"
>
> do_install () {
> install -d ${D}/${bindir}
> --
> 2.7.4
>
--
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dunfell][PATCH] linuxptp: Fix cross build
2021-05-17 16:46 ` Denys Dmytriyenko
@ 2021-05-22 23:16 ` Armin Kuster
2021-05-23 1:11 ` Denys Dmytriyenko
0 siblings, 1 reply; 4+ messages in thread
From: Armin Kuster @ 2021-05-22 23:16 UTC (permalink / raw)
To: Denys Dmytriyenko, openembedded-devel; +Cc: Khem Raj
in dunfell-next. waiting for merge.
-armin
On 5/17/21 9:46 AM, Denys Dmytriyenko wrote:
> ping.
>
> On Mon, May 03, 2021 at 05:56:00PM -0400, Denys Dmytriyenko wrote:
>> From: Khem Raj <raj.khem@gmail.com>
>>
>> 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>
>> ---
>> .../linuxptp/Use-cross-cpp-in-incdefs.patch | 26 +++++++++++++++++++
>> .../linuxptp/no-incdefs-using-host-headers.patch | 29 ----------------------
>> .../recipes-connectivity/linuxptp/linuxptp_2.0.bb | 7 +++---
>> 3 files changed, 30 insertions(+), 32 deletions(-)
>> create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
>> delete mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
>>
>> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
>> new file mode 100644
>> index 0000000..8760886
>> --- /dev/null
>> +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
>> @@ -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
>> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
>> deleted file mode 100644
>> index 02dbb23..0000000
>> --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
>> +++ /dev/null
>> @@ -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
>> -
>> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
>> index 930c667..e80abc7 100644
>> --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
>> +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
>> @@ -4,15 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>>
>> SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
>> 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 \
>> "
>>
>> SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"
>> SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d"
>>
>> -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \
>> - EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'"
>> +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'"
>> +
>> +export KBUILD_OUTPUT="${RECIPE_SYSROOT}"
>>
>> do_install () {
>> install -d ${D}/${bindir}
>> --
>> 2.7.4
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dunfell][PATCH] linuxptp: Fix cross build
2021-05-22 23:16 ` Armin Kuster
@ 2021-05-23 1:11 ` Denys Dmytriyenko
0 siblings, 0 replies; 4+ messages in thread
From: Denys Dmytriyenko @ 2021-05-23 1:11 UTC (permalink / raw)
To: akuster808; +Cc: openembedded-devel, Khem Raj
Thanks! Saw it dunfell-dut and your pull request.
On Sat, May 22, 2021 at 04:16:04PM -0700, akuster808 wrote:
> in dunfell-next. waiting for merge.
>
> -armin
>
> On 5/17/21 9:46 AM, Denys Dmytriyenko wrote:
> > ping.
> >
> > On Mon, May 03, 2021 at 05:56:00PM -0400, Denys Dmytriyenko wrote:
> >> From: Khem Raj <raj.khem@gmail.com>
> >>
> >> 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>
> >> ---
> >> .../linuxptp/Use-cross-cpp-in-incdefs.patch | 26 +++++++++++++++++++
> >> .../linuxptp/no-incdefs-using-host-headers.patch | 29 ----------------------
> >> .../recipes-connectivity/linuxptp/linuxptp_2.0.bb | 7 +++---
> >> 3 files changed, 30 insertions(+), 32 deletions(-)
> >> create mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
> >> delete mode 100644 meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
> >>
> >> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
> >> new file mode 100644
> >> index 0000000..8760886
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch
> >> @@ -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
> >> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch b/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
> >> deleted file mode 100644
> >> index 02dbb23..0000000
> >> --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
> >> +++ /dev/null
> >> @@ -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
> >> -
> >> diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
> >> index 930c667..e80abc7 100644
> >> --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
> >> +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb
> >> @@ -4,15 +4,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> >>
> >> SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \
> >> 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 \
> >> "
> >>
> >> SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11"
> >> SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d"
> >>
> >> -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \
> >> - EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'"
> >> +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'"
> >> +
> >> +export KBUILD_OUTPUT="${RECIPE_SYSROOT}"
> >>
> >> do_install () {
> >> install -d ${D}/${bindir}
> >> --
> >> 2.7.4
> >>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-23 1:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-03 21:56 [dunfell][PATCH] linuxptp: Fix cross build Denys Dmytriyenko
2021-05-17 16:46 ` Denys Dmytriyenko
2021-05-22 23:16 ` Armin Kuster
2021-05-23 1:11 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.