blob: 4b02068991b0e3c58d6d6d5df97fc0297a53c72e [file] [log] [blame]
Patrick Williams92b42cb2022-09-03 06:53:57 -05001From b4a6e3c8309cff0f2311cd959c5091213b633851 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 7 Feb 2017 14:35:43 +0000
4Subject: [PATCH] slang: rewrite recipe to run autoconf
5
Brad Bishop6e60e8b2018-02-01 10:27:11 -05006SLANG_INST_LIB is the location of where slang will end up, but when building for
7packaging this doesn't have DESTDIR appended so can potentially link to the host
8for cross builds and will trigger QA errors.
9
10As this is obviously wrong, delete it.
11
12Upstream-Status: Pending
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14
Patrick Williams92b42cb2022-09-03 06:53:57 -050015---
16 slsh/Makefile.in | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
Brad Bishop6e60e8b2018-02-01 10:27:11 -050019diff --git a/slsh/Makefile.in b/slsh/Makefile.in
Patrick Williams92b42cb2022-09-03 06:53:57 -050020index addd343..63a5c9b 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050021--- a/slsh/Makefile.in
22+++ b/slsh/Makefile.in
Patrick Williams92b42cb2022-09-03 06:53:57 -050023@@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@
24 #----------------------------------------------------------------------------
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)