diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-12 17:52:12 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-12 17:52:15 +0200 |
| commit | 2071e277705be49925b45115fefeda52f89052b7 (patch) | |
| tree | 6f393839d24683f3601c69b5f0a5b9c8b2157b51 | |
| parent | 67d96331bffa729422ca553dfa243c6c90b74cff (diff) | |
| download | ptxdist-2071e277705be49925b45115fefeda52f89052b7.tar.gz ptxdist-2071e277705be49925b45115fefeda52f89052b7.tar.xz | |
libgpg-error: find lock-obj-pub.*.h for all architectures
The available header files have changed so the pattern to copy must be
updated.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/libgpg-error.make | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make index 968651590..c99e333cb 100644 --- a/rules/libgpg-error.make +++ b/rules/libgpg-error.make @@ -31,7 +31,8 @@ LIBGPG_ERROR_LICENSE_FILES := \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 # Use '=' to delay $(shell ...) calls until this is needed -LIBGPG_ERROR_TARGET = $(patsubst %-gnueabihf,%-gnueabi,$(patsubst i%86-pc-linux-gnu,i686-pc-linux-gnu,$(shell target=$(PTXCONF_GNU_TARGET); echo $${target/-*-linux/-$(if $(PTXCONF_ARCH_X86),pc,unknown)-linux}))) +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 @@ -56,8 +57,10 @@ LIBGPG_ERROR_CONF_OPT := \ $(STATEDIR)/libgpg-error.prepare: @$(call targetinfo) - @cp -v $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(LIBGPG_ERROR_TARGET).h \ - $(LIBGPG_ERROR_DIR)/src/syscfg/lock-obj-pub.$(call remove_quotes, $(PTXCONF_GNU_TARGET)).h + @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) |