mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-04 02:43:30 +08:00
12a7f9971a
Commit ca0e5152 introduced a bad option order, leading to another build
failure.
Fixes
http://autobuild.buildroot.org/results/0e7de5e7c792b5ef195ee98fe1e7bb1c6b220bfb/build-end.log
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 58c34ae1343e2a452e08cd160936a231bcdb67a1 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Tue, 18 Dec 2012 09:57:47 +0100
|
|
Subject: [PATCH] Remove the dependency on /proc
|
|
|
|
The Makefile relied on a broken logic for the INSTALL_PC_MACRO.
|
|
It was used like this: $(INSTALL_PC_MACRO) file.
|
|
|
|
The INSTALL_PC_MACRO was then expanded with a trailing sharp, to pass
|
|
the name of the file to install as a comment at the end of the command.
|
|
|
|
And then, to retrieve the file to copy, it used the $NF variable of awk
|
|
on the /proc/self/cmdline file to happily reinvent the argument
|
|
mechanism.
|
|
|
|
This patch removes of this crazy stuff by using the -t option of
|
|
install, that keeps the same calling convention.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
---
|
|
macros.mk | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/macros.mk b/macros.mk
|
|
index 6162900..eb61ead 100644
|
|
--- a/macros.mk
|
|
+++ b/macros.mk
|
|
@@ -150,9 +150,8 @@ endif
|
|
INSTALL_PC_MACRO += \
|
|
$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
|
|
-d "$(INSTALL_LIB_DIR)/pkgconfig"; \
|
|
- $(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
|
|
- "$$(cat /proc/$$$$/cmdline | awk '{print $$(NF)}')" \
|
|
- "$(INSTALL_LIB_DIR)/pkgconfig"; \#
|
|
+ $(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 -t \
|
|
+ "$(INSTALL_LIB_DIR)/pkgconfig"
|
|
|
|
ifeq ($(V),0)
|
|
INSTALL_INC_MACRO = @echo " INSTALL $^ ($(INSTALL_INC_DIR))";
|
|
--
|
|
1.7.9.5
|
|
|