diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-09 13:02:42 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-10 18:09:53 +0100 |
| commit | aad5d74db2d2606d11029255d859729212bc6b72 (patch) | |
| tree | 5e40be9478510466c93438639a8c8f8121f4aab0 /patches/slang-2.3.2 | |
| parent | 7161dc37e9608accd67c4101239e8e0dd5c9575a (diff) | |
| download | ptxdist-aad5d74db2d2606d11029255d859729212bc6b72.tar.gz ptxdist-aad5d74db2d2606d11029255d859729212bc6b72.tar.xz | |
slang: add one more parallel build fix
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/slang-2.3.2')
| -rw-r--r-- | patches/slang-2.3.2/0002-fix-parallel-building.patch | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/patches/slang-2.3.2/0002-fix-parallel-building.patch b/patches/slang-2.3.2/0002-fix-parallel-building.patch index a8ec633ec..766162110 100644 --- a/patches/slang-2.3.2/0002-fix-parallel-building.patch +++ b/patches/slang-2.3.2/0002-fix-parallel-building.patch @@ -2,11 +2,40 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> Date: Fri, 30 Mar 2018 16:35:56 +0200 Subject: [PATCH] fix parallel building +Just use the original config.h instead of copying it. The directory is +already in the include path anyways. This is easier than adding all missing +dependencies on config.h. + +Make sure that the elfdir is created before using it. + Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + modules/Makefile.in | 4 +--- + src/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) +diff --git a/modules/Makefile.in b/modules/Makefile.in +index f82f0edbb1c9..f3a677076526 100644 +--- a/modules/Makefile.in ++++ b/modules/Makefile.in +@@ -21,7 +21,7 @@ CC_SHARED_FLAGS = @CC_SHARED_FLAGS@ + CC_SHARED = $(CC) $(INCS) $(CC_SHARED_FLAGS) $(CFLAGS) + CONFIG_DIR = @CONFIG_DIR@ + SRCDIR = $(CONFIG_DIR)/modules +-CONFIG_H = $(SRCDIR)/config.h ++CONFIG_H = $(CONFIG_DIR)/src/config.h + SLINT_H = $(SRCDIR)/slint.h + OBJDIR = $(ARCH)objs + OBJDIR_TSTAMP = $(OBJDIR)/tstamp +@@ -95,8 +95,6 @@ COMPILE_CMD = $(CC_SHARED) $(INCS) + # --------------------------------------------------------------------------- + all: $(OBJDIR)/Makefile + cd $(OBJDIR) && $(MAKE) $(MODULES) +-$(CONFIG_H): $(CONFIG_DIR)/src/config.h +- cp $(CONFIG_DIR)/src/config.h $(CONFIG_H) + $(SLINT_H): $(CONFIG_DIR)/src/_slint.h + cp $(CONFIG_DIR)/src/_slint.h $(SLINT_H) + $(OBJDIR_TSTAMP): diff --git a/src/Makefile.in b/src/Makefile.in index 60681422ddfc..2df737816742 100644 --- a/src/Makefile.in |