summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/luajit-no_ldconfig.patch
diff options
context:
space:
mode:
authorTomáš Čech <sleep_walker@suse.cz>2015-02-25 14:51:32 +0100
committerTomáš Čech <sleep_walker@suse.cz>2015-02-26 00:43:02 +0100
commitdcaf2511d7a17ab34444ae74b31594ca30a65ff5 (patch)
tree1d8bb85744247775f6ccf49c6035fd7332f48952 /gnu/packages/patches/luajit-no_ldconfig.patch
parent447260319b645e2e8d06817c9de2cded1cf6b32b (diff)
gnu: Fix luajit installation
* gnu/packages/lua.scm (luajit): Apply 2 patches. * gnu-system.am (dist_patch_DATA): Register 2 patches. * gnu/packages/patches/luajit-no_ldconfig.patch: New file. * gnu/packages/patches/luajit-symlinks.patch: New file.
Diffstat (limited to 'gnu/packages/patches/luajit-no_ldconfig.patch')
-rw-r--r--gnu/packages/patches/luajit-no_ldconfig.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/gnu/packages/patches/luajit-no_ldconfig.patch b/gnu/packages/patches/luajit-no_ldconfig.patch
new file mode 100644
index 0000000000..8000e8e4e5
--- /dev/null
+++ b/gnu/packages/patches/luajit-no_ldconfig.patch
@@ -0,0 +1,31 @@
+From 629200f48e18dc1a3a5229739748bad0e2a6a0a2 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@suse.cz>
+Date: Wed, 4 Feb 2015 11:37:16 +0100
+Subject: [PATCH] Do not silently and prematurely end install when ldconfig is
+ missing
+
+---
+ Makefile | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 343ecb5..4667146 100644
+--- a/Makefile
++++ b/Makefile
+@@ -112,9 +112,10 @@ install: $(INSTALL_DEP)
+ $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+ cd src && test -f $(FILE_SO) && \
+ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
+- $(LDCONFIG) $(INSTALL_LIB) && \
+- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
++ ( $(LDCONFIG) $(INSTALL_LIB) ; \
++ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
++ $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : \
++ )
+ cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
+ cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
+ $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
+--
+2.2.2
+