* [ptxdist] [PATCH] rules/libgpg-error.make: Remove broken triplet handling.
@ 2021-09-10 9:05 Christian Melki
2021-09-29 11:49 ` Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2021-09-10 9:05 UTC (permalink / raw)
To: ptxdist
libgpg-error, historically being rather cross-compile unfriendly,
has gotten better in the later releases.
Also, this type of triplet handling is broken for triplets without
vendor and various other cases.
This creates more problems than it solves. Remove.
---
rules/libgpg-error.make | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 194cd21db..c04d02210 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -30,10 +30,6 @@ LIBGPG_ERROR_LICENSE_FILES := \
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
-# Use '=' to delay $(shell ...) calls until this is needed
-LIBGPG_ERROR_TARGET = $(patsubst %-gnueabihf,%-gnueabi,$(patsubst i%86-unknown-linux-gnu,i686-unknown-linux-gnu,$(shell target=$(PTXCONF_GNU_TARGET); echo $${target/-*-linux/-unknown-linux})))
-LIBGPG_ERROR_TARGET_PTX := $(call remove_quotes, $(PTXCONF_GNU_TARGET))
-
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
@@ -55,15 +51,6 @@ LIBGPG_ERROR_CONF_OPT := \
--disable-doc \
--disable-tests
-$(STATEDIR)/libgpg-error.prepare:
- @$(call targetinfo)
- @if [ ! -e $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET_PTX).h ]; then \
- cp -v $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET).h \
- $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET_PTX).h; \
- fi
- @$(call world/prepare, LIBGPG_ERROR)
- @$(call touch)
-
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCH] rules/libgpg-error.make: Remove broken triplet handling.
2021-09-10 9:05 [ptxdist] [PATCH] rules/libgpg-error.make: Remove broken triplet handling Christian Melki
@ 2021-09-29 11:49 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-09-29 11:49 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
"libgpg-error: " as subject prefix.
On Fri, Sep 10, 2021 at 11:05:23AM +0200, Christian Melki wrote:
> libgpg-error, historically being rather cross-compile unfriendly,
> has gotten better in the later releases.
Please mention here that the header is now generated at configure time to
explain why this stuff is no longer needed.
> Also, this type of triplet handling is broken for triplets without
> vendor and various other cases.
> This creates more problems than it solves. Remove.
You're Signed-off-by is missing. This also applied to your other patches.
Michael
> ---
> rules/libgpg-error.make | 13 -------------
> 1 file changed, 13 deletions(-)
>
> diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
> index 194cd21db..c04d02210 100644
> --- a/rules/libgpg-error.make
> +++ b/rules/libgpg-error.make
> @@ -30,10 +30,6 @@ LIBGPG_ERROR_LICENSE_FILES := \
> file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
> file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
>
> -# Use '=' to delay $(shell ...) calls until this is needed
> -LIBGPG_ERROR_TARGET = $(patsubst %-gnueabihf,%-gnueabi,$(patsubst i%86-unknown-linux-gnu,i686-unknown-linux-gnu,$(shell target=$(PTXCONF_GNU_TARGET); echo $${target/-*-linux/-unknown-linux})))
> -LIBGPG_ERROR_TARGET_PTX := $(call remove_quotes, $(PTXCONF_GNU_TARGET))
> -
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
> @@ -55,15 +51,6 @@ LIBGPG_ERROR_CONF_OPT := \
> --disable-doc \
> --disable-tests
>
> -$(STATEDIR)/libgpg-error.prepare:
> - @$(call targetinfo)
> - @if [ ! -e $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET_PTX).h ]; then \
> - cp -v $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET).h \
> - $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET_PTX).h; \
> - fi
> - @$(call world/prepare, LIBGPG_ERROR)
> - @$(call touch)
> -
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-29 11:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-10 9:05 [ptxdist] [PATCH] rules/libgpg-error.make: Remove broken triplet handling Christian Melki
2021-09-29 11:49 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox