[ptxdist] [PATCH] pre/Rules.make: Let CMAKE_INSTALL_LIBDIR be relative, as per spec.

[ptxdist] [PATCH] pre/Rules.make: Let CMAKE_INSTALL_LIBDIR be relative, as per spec.

[Christian Melki]

This means that packages that assume that this variable is absolute
will have to be modified.
Adding something like -DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR),
after CROSS_CMAKE_USR to your CONF_OPT will probably suffice.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/pre/Rules.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
index 54a677c47..0943a51b7 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make
@@ -233,7 +233,7 @@ CROSS_AUTOCONF_ROOT := $(CROSS_AUTOCONF_SYSROOT_ROOT) $(CROSS_AUTOCONF_ARCH)
 
 CROSS_CMAKE_USR	 := \
 	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR) \
+	-DCMAKE_INSTALL_LIBDIR=$(CROSS_LIB_DIR) \
 	-DCMAKE_INSTALL_SYSCONFDIR=/etc \
 	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 	-DCMAKE_TOOLCHAIN_FILE='${PTXDIST_CMAKE_TOOLCHAIN_TARGET}'
-- 
2.32.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH] pre/Rules.make: Let CMAKE_INSTALL_LIBDIR be relative, as per spec.

[Denis Osterland-Heim]

Am Montag, den 09.08.2021, 10:36 +0200 schrieb Christian Melki:
> This means that packages that assume that this variable is absolute
> will have to be modified.
> Adding something like -DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR),
> after CROSS_CMAKE_USR to your CONF_OPT will probably suffice.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
Reviewed-by: Denis Osterland-Heim <denis.osterland@diehl.com>
> ---
>  rules/pre/Rules.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
> index 54a677c47..0943a51b7 100644
> --- a/rules/pre/Rules.make
> +++ b/rules/pre/Rules.make
> @@ -233,7 +233,7 @@ CROSS_AUTOCONF_ROOT := $(CROSS_AUTOCONF_SYSROOT_ROOT) $(CROSS_AUTOCONF_ARCH)
>
>  CROSS_CMAKE_USR := \
>  -DCMAKE_INSTALL_PREFIX=/usr \
> --DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR) \
> +-DCMAKE_INSTALL_LIBDIR=$(CROSS_LIB_DIR) \
>  -DCMAKE_INSTALL_SYSCONFDIR=/etc \
>  -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
>  -DCMAKE_TOOLCHAIN_FILE='${PTXDIST_CMAKE_TOOLCHAIN_TARGET}'
Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315

________________________________

Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.

- Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter:

https://www.diehl.com/group/de/transparenz-und-informationspflichten/

The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.

- For general information on data protection and your respective rights please visit:

https://www.diehl.com/group/en/transparency-and-information-obligations/


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH] pre/Rules.make: Let CMAKE_INSTALL_LIBDIR be relative, as per spec.

[Alexander Dahl]

Hei hei,

Am Dienstag, 10. August 2021, 07:45:34 CEST schrieb Denis Osterland-Heim:
> Am Montag, den 09.08.2021, 10:36 +0200 schrieb Christian Melki:
> 
> > This means that packages that assume that this variable is absolute
> > will have to be modified.
> > Adding something like -DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR),
> > after CROSS_CMAKE_USR to your CONF_OPT will probably suffice.
> >
> >
> >
> > Signed-off-by: Christian Melki <christian.melki@t2data.com>
> 
> Reviewed-by: Denis Osterland-Heim <denis.osterland@diehl.com>

Tested-by: Alexander Dahl <ada@thorsis.com>

In fact 62f3fc6e4bf9 ("Add missing install CROSS_LIB_DIR for CMAKE 
environments.") released with ptxdist-2021.06 broke our CMake based package 
prepare stages.  Applications were not able to find libraries anymore. Adding 
this patch, build succeeds again.  

Thanks Christian for giving me the hint in IRC.

Greets
Alex

> 
> > ---
> > 
> >  rules/pre/Rules.make | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >
> >
> > diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
> > index 54a677c47..0943a51b7 100644
> > --- a/rules/pre/Rules.make
> > +++ b/rules/pre/Rules.make
> > @@ -233,7 +233,7 @@ CROSS_AUTOCONF_ROOT := $(CROSS_AUTOCONF_SYSROOT_ROOT)
> > $(CROSS_AUTOCONF_ARCH)
>
> >
> >
> >  CROSS_CMAKE_USR := \
> >  -DCMAKE_INSTALL_PREFIX=/usr \
> > 
> > --DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR) \
> > +-DCMAKE_INSTALL_LIBDIR=$(CROSS_LIB_DIR) \
> > 
> >  -DCMAKE_INSTALL_SYSCONFDIR=/etc \
> >  -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
> >  -DCMAKE_TOOLCHAIN_FILE='${PTXDIST_CMAKE_TOOLCHAIN_TARGET}'
> 
> Diehl Connectivity Solutions GmbH
> Geschäftsführung: Horst Leonberger
> Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
> Nürnberg: HRB 32315
> 
> ________________________________
> 
> Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail
> enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
> Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise
> erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede
> unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung
> und/oder Publikation dieser E-Mail ist strengstens untersagt. 
> - Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie
> unter:
 
> https://www.diehl.com/group/de/transparenz-und-informationspflichten/
> 
> The contents of the above mentioned e-mail is not legally binding. This
> e-mail contains confidential and/or legally protected information. Please
> inform us if you have received this e-mail by
 mistake and delete it in
> such a case. Each unauthorized reproduction, disclosure, alteration,
> distribution and/or publication of this e-mail is strictly prohibited. 
> - For general information on data protection and your respective rights
> please visit:
 
> https://www.diehl.com/group/en/transparency-and-information-obligations/
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-request@pengutronix.de





_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] pre/Rules.make: Let CMAKE_INSTALL_LIBDIR be relative, as per spec.

[Michael Olbrich]

Thanks, applied as 3fa9174fa8ce494337253620f87ed2c9de631cec.

Michael

[sent from post-receive hook]

On Thu, 07 Oct 2021 12:18:19 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> This means that packages that assume that this variable is absolute
> will have to be modified.
> Adding something like -DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR),
> after CROSS_CMAKE_USR to your CONF_OPT will probably suffice.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Reviewed-by: Denis Osterland-Heim <denis.osterland@diehl.com>
> Tested-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20210809083621.3676-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
> index 54a677c474d2..0943a51b7a1d 100644
> --- a/rules/pre/Rules.make
> +++ b/rules/pre/Rules.make
> @@ -233,7 +233,7 @@ CROSS_AUTOCONF_ROOT := $(CROSS_AUTOCONF_SYSROOT_ROOT) $(CROSS_AUTOCONF_ARCH)
>  
>  CROSS_CMAKE_USR	 := \
>  	-DCMAKE_INSTALL_PREFIX=/usr \
> -	-DCMAKE_INSTALL_LIBDIR=/usr/$(CROSS_LIB_DIR) \
> +	-DCMAKE_INSTALL_LIBDIR=$(CROSS_LIB_DIR) \
>  	-DCMAKE_INSTALL_SYSCONFDIR=/etc \
>  	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
>  	-DCMAKE_TOOLCHAIN_FILE='${PTXDIST_CMAKE_TOOLCHAIN_TARGET}'

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de