blob: a60e1178b0f53fd7f7c0c0025d8d8ca80a381b60 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
Upstream: no.
Reason: >>> WARNING: slang*: Redundant /usr/lib in rpath found
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -89,7 +89,7 @@
# ---------------------------------------------------------------------------
RPATH = @RPATH@
-LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
+LIBS = $(LDFLAGS) $(SLANG_LIB) $(DL_LIB) @M_LIB@
INCS = $(SLANG_SRCINC)
COMPILE_CMD = $(CC_SHARED) $(INCS)
# ---------------------------------------------------------------------------
--- b/slsh/Makefile.in
+++ b/slsh/Makefile.in
@@ -77,7 +77,7 @@
#----------------------------------------------------------------------------
@SET_MAKE@
SHELL = /bin/sh
-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
+INST_LIBS = $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF)
|
