diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2016-04-28 16:33:13 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-01 09:12:26 +0200 |
commit | 68f1992a39ca9c28157facbfd6bdf50aedd5c733 (patch) | |
tree | 8584d33ddb5d5b32806762e264cdf54a53aa0c4d /patches | |
parent | c6a03d478479f1dda8c4c9cefcde72dd531ae390 (diff) | |
download | ptxdist-68f1992a39ca9c28157facbfd6bdf50aedd5c733.tar.gz ptxdist-68f1992a39ca9c28157facbfd6bdf50aedd5c733.tar.xz |
slang: version bump to 2.3.0
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/slang-2.3.0/0001-Makefile.in-fix-cross-compiling.patch | 25 | ||||
-rw-r--r-- | patches/slang-2.3.0/series | 4 |
2 files changed, 29 insertions, 0 deletions
diff --git a/patches/slang-2.3.0/0001-Makefile.in-fix-cross-compiling.patch b/patches/slang-2.3.0/0001-Makefile.in-fix-cross-compiling.patch new file mode 100644 index 000000000..9444b72b2 --- /dev/null +++ b/patches/slang-2.3.0/0001-Makefile.in-fix-cross-compiling.patch @@ -0,0 +1,25 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Thu, 28 Apr 2016 13:42:53 +0200 +Subject: [PATCH] Makefile.in: fix cross compiling + +Don't use SLANG_INST_LIB (= the installation path == /use/lib) during +link time. + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + slsh/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/slsh/Makefile.in b/slsh/Makefile.in +index 3e5de0b576bf..4c768c1a2e77 100644 +--- a/slsh/Makefile.in ++++ b/slsh/Makefile.in +@@ -69,7 +69,7 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_DIR) + @SET_MAKE@ + SHELL = /bin/sh + #INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS) +-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) ++INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(OTHER_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)' diff --git a/patches/slang-2.3.0/series b/patches/slang-2.3.0/series new file mode 100644 index 000000000..006cec334 --- /dev/null +++ b/patches/slang-2.3.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Makefile.in-fix-cross-compiling.patch +# 756aba2eb71d46f62587f192000758e4 - git-ptx-patches magic |