[ptxdist] [RFC] [PATCH] make cmake use the projects sysroot

[ptxdist] [RFC] [PATCH] make cmake use the projects sysroot

[Josef Holzmayr]

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


-- 
_____________________________________________________________
Josef Holzmayr
Dipl-Ing. (FH)
Entwicklung Embedded Devices / Software

Tel.: +49 8444 9204-48>
Fax:  +49 8444 9204-50
holzmayr@rsi-elektrotechnik.de

R-S-I Elektrotechnik GmbH & Co. KG
Woelkestrasse 11
D-85301 Schweitenkirchen
www.rsi-elektrotechnik.de
_____________________________________________________________
Amtsgericht Ingolstadt - GmbH: HRB 191328 - KG: HRA 170363
Geschäftsführer: Dr.-Ing. Michael Sorg, Dipl.-Ing. Franz Sorg
USt-IdNr.: DE 128592548

[-- Attachment #2: 0001-fix-cmake-toolchain.patch --]
[-- Type: text/x-patch, Size: 861 bytes --]

From f3c3bde34f1901210d428801b108cb18d6e7a281 Mon Sep 17 00:00:00 2001
From: Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>
Date: Mon, 30 Jan 2012 12:45:25 +0100
Subject: [PATCH] fix cmake toolchain

---
 scripts/lib/ptxd_make_cmake_toolchain.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh b/scripts/lib/ptxd_make_cmake_toolchain.sh
index 1712934..cd3a993 100644
--- a/scripts/lib/ptxd_make_cmake_toolchain.sh
+++ b/scripts/lib/ptxd_make_cmake_toolchain.sh
@@ -30,7 +30,7 @@ ptxd_make_cmake_toolchain_target() {
 	CC="$(which "${CC}")" \
 	CXX="$(which "${CXX}")" \
 	\
-	SYSROOT="${PTXDIST_PATH_SYSROOT_ALL//:/ }" \
+	SYSROOT="${PTXDIST_SYSROOT_TOOLCHAIN//:/ }" \
 	INCLUDE_DIRECTORIES="${sysroot_prefix//://include }" \
 	LINK_DIRECTORIES="${sysroot_prefix//://lib }" \
 	\
-- 
1.7.8.3


[-- Attachment #3: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [RFC] [PATCH] make cmake use the projects sysroot

[Michael Olbrich]

On Thu, Oct 25, 2012 at 11:47:52AM +0200, Josef Holzmayr wrote:
> >From f3c3bde34f1901210d428801b108cb18d6e7a281 Mon Sep 17 00:00:00 2001
> From: Josef Holzmayr <holzmayr@rsi-elektrotechnik.de>
> Date: Mon, 30 Jan 2012 12:45:25 +0100
> Subject: [PATCH] fix cmake toolchain
> 
> ---
>  scripts/lib/ptxd_make_cmake_toolchain.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh b/scripts/lib/ptxd_make_cmake_toolchain.sh
> index 1712934..cd3a993 100644
> --- a/scripts/lib/ptxd_make_cmake_toolchain.sh
> +++ b/scripts/lib/ptxd_make_cmake_toolchain.sh
> @@ -30,7 +30,7 @@ ptxd_make_cmake_toolchain_target() {
>  	CC="$(which "${CC}")" \
>  	CXX="$(which "${CXX}")" \
>  	\
> -	SYSROOT="${PTXDIST_PATH_SYSROOT_ALL//:/ }" \
> +	SYSROOT="${PTXDIST_SYSROOT_TOOLCHAIN//:/ }" \

No, this is wrong. PTXDIST_PATH_SYSROOT_ALL is supposed to include
PTXDIST_SYSROOT_TOOLCHAIN anyways. However this not the case any more. I've
committed a patch to fix that. Hopefully I didn't break anything else.

Michael

>  	INCLUDE_DIRECTORIES="${sysroot_prefix//://include }" \
>  	LINK_DIRECTORIES="${sysroot_prefix//://lib }" \
>  	\
> -- 
> 1.7.8.3
> 

> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de