Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 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 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 6 | SLANG_INST_LIB is the location of where slang will end up, but when building for |
| 7 | packaging this doesn't have DESTDIR appended so can potentially link to the host |
| 8 | for cross builds and will trigger QA errors. |
| 9 | |
| 10 | As this is obviously wrong, delete it. |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 14 | |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 15 | --- |
| 16 | slsh/Makefile.in | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 19 | diff --git a/slsh/Makefile.in b/slsh/Makefile.in |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 20 | index addd343..63a5c9b 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 21 | --- a/slsh/Makefile.in |
| 22 | +++ b/slsh/Makefile.in |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 23 | @@ -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) |