diff options
Diffstat (limited to 'meta/recipes-extended/slang/slang/dont-link-to-host.patch')
-rw-r--r-- | meta/recipes-extended/slang/slang/dont-link-to-host.patch | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/meta/recipes-extended/slang/slang/dont-link-to-host.patch b/meta/recipes-extended/slang/slang/dont-link-to-host.patch index 42dba0fae4..4b02068991 100644 --- a/meta/recipes-extended/slang/slang/dont-link-to-host.patch +++ b/meta/recipes-extended/slang/slang/dont-link-to-host.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From b4a6e3c8309cff0f2311cd959c5091213b633851 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 7 Feb 2017 14:35:43 +0000 | ||
4 | Subject: [PATCH] slang: rewrite recipe to run autoconf | ||
5 | |||
1 | SLANG_INST_LIB is the location of where slang will end up, but when building for | 6 | SLANG_INST_LIB is the location of where slang will end up, but when building for |
2 | packaging this doesn't have DESTDIR appended so can potentially link to the host | 7 | packaging this doesn't have DESTDIR appended so can potentially link to the host |
3 | for cross builds and will trigger QA errors. | 8 | for cross builds and will trigger QA errors. |
@@ -7,10 +12,20 @@ As this is obviously wrong, delete it. | |||
7 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
8 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 13 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
9 | 14 | ||
15 | --- | ||
16 | slsh/Makefile.in | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
10 | diff --git a/slsh/Makefile.in b/slsh/Makefile.in | 19 | diff --git a/slsh/Makefile.in b/slsh/Makefile.in |
11 | index cba9d81..4c1c370 100644 | 20 | index addd343..63a5c9b 100644 |
12 | --- a/slsh/Makefile.in | 21 | --- a/slsh/Makefile.in |
13 | +++ b/slsh/Makefile.in | 22 | +++ b/slsh/Makefile.in |
14 | @@ -80 +80 @@ SHELL = /bin/sh | 23 | @@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@ |
15 | -INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) | 24 | #---------------------------------------------------------------------------- |
16 | +INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) | 25 | @SET_MAKE@ |
26 | SHELL = /bin/sh | ||
27 | -INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS) | ||
28 | +INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS) | ||
29 | DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \ | ||
30 | -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \ | ||
31 | -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF) | ||