diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-03 11:17:18 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-03 11:17:30 +0200 |
commit | e3a9a8b7c885599fbb90f9e8992ff5d47c243ea5 (patch) | |
tree | 924bd52f8d5d5ba1b4ed4804159a7ffd0c07851c | |
parent | 4cb1127b5566236673ef93209635d6ffbc4a1ffe (diff) | |
download | ptxdist-e3a9a8b7c885599fbb90f9e8992ff5d47c243ea5.tar.gz ptxdist-e3a9a8b7c885599fbb90f9e8992ff5d47c243ea5.tar.xz |
jed: fix cross-compile hack for parallel building
The patch removed all dependencies for chkslang. As a result, $(OBJDIR)
might not exist yet and creating the symlink fails.
Add a existence only dependency on $(OBJDIR) to fix this.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/jed-0.99-19/0001-jed-don-t-execute-cross-compiled-files.patch (renamed from patches/jed-0.99-19/jed-0.99-18-chkslang.diff) | 16 | ||||
-rw-r--r-- | patches/jed-0.99-19/0002-avoid-rpath.patch (renamed from patches/jed-0.99-19/jed-0.99-18-rpath-hack.diff) | 10 | ||||
-rw-r--r-- | patches/jed-0.99-19/series | 7 |
3 files changed, 18 insertions, 15 deletions
diff --git a/patches/jed-0.99-19/jed-0.99-18-chkslang.diff b/patches/jed-0.99-19/0001-jed-don-t-execute-cross-compiled-files.patch index c09982a71..1129a3fb9 100644 --- a/patches/jed-0.99-19/jed-0.99-18-chkslang.diff +++ b/patches/jed-0.99-19/0001-jed-don-t-execute-cross-compiled-files.patch @@ -1,5 +1,6 @@ From: Robert Schwebel <r.schwebel@pengutronix.de> -Subject: jed: don't execute cross compiled files +Date: Wed, 3 Oct 2018 11:15:59 +0200 +Subject: [PATCH] jed: don't execute cross compiled files When cross compiling, chkslang is a tool for the "host" machine, but we try to run it on the "build" box. @@ -7,15 +8,14 @@ try to run it on the "build" box. Hack alert - not for upstream. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - --- - src/Makefile.in | 5 ++--- + src/Makefile.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -Index: jed-0.99-19/src/Makefile.in -=================================================================== ---- jed-0.99-19.orig/src/Makefile.in -+++ jed-0.99-19/src/Makefile.in +diff --git a/src/Makefile.in b/src/Makefile.in +index e91f66a1dea8..d2033fba2771 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in @@ -160,9 +160,8 @@ slangversion: $(OBJDIR)/chkslang if $(OBJDIR)/chkslang jed $(MIN_SLANG_VERSION) $(MAX_SLANG_VERSION);\ then exit 0; else $(RM) $(OBJDIR)/chkslang; exit 1; fi @@ -23,7 +23,7 @@ Index: jed-0.99-19/src/Makefile.in -$(OBJDIR)/chkslang: config.h Makefile chkslang.c $(DOT_O_DEPS) $(chkslang_O_DEP) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) $(SRCDIR)/chkslang.c -o $(OBJDIR)/chkslang $(COMMON_LIBS) - -+$(OBJDIR)/chkslang: ++$(OBJDIR)/chkslang: | $(OBJDIR) + rm -f $@; ln -s /bin/true $@ $(OBJDIR): diff --git a/patches/jed-0.99-19/jed-0.99-18-rpath-hack.diff b/patches/jed-0.99-19/0002-avoid-rpath.patch index 5428671d8..c0cb81558 100644 --- a/patches/jed-0.99-19/jed-0.99-18-rpath-hack.diff +++ b/patches/jed-0.99-19/0002-avoid-rpath.patch @@ -1,5 +1,6 @@ From: Robert Schwebel <r.schwebel@pengutronix.de> -Subject: avoid rpath +Date: Wed, 3 Oct 2018 11:15:59 +0200 +Subject: [PATCH] avoid rpath An rpath on the target is uggly as hell when cross compiling. Disable it. This is just a hack and not intended for upstream. I was too lazy to @@ -7,13 +8,12 @@ fix it in the m4 macros... in the end, it's just an emacs clone, so it isn't worth it :-) Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - --- - configure | 2 ++ + configure | 2 ++ 1 file changed, 2 insertions(+) -Index: b/configure -=================================================================== +diff --git a/configure b/configure +index 2dc36ae5daa4..661a3ae35fe2 100755 --- a/configure +++ b/configure @@ -11466,6 +11466,8 @@ esac diff --git a/patches/jed-0.99-19/series b/patches/jed-0.99-19/series index d6609c6a9..3986b7794 100644 --- a/patches/jed-0.99-19/series +++ b/patches/jed-0.99-19/series @@ -1,2 +1,5 @@ -jed-0.99-18-chkslang.diff -jed-0.99-18-rpath-hack.diff +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-jed-don-t-execute-cross-compiled-files.patch +0002-avoid-rpath.patch +# 5ef540b082b80bd2e3d53023327d388b - git-ptx-patches magic |