diff options
| author | Tomáš Čech <sleep_walker@suse.cz> | 2015-02-25 14:51:32 +0100 |
|---|---|---|
| committer | Tomáš Čech <sleep_walker@suse.cz> | 2015-02-26 00:43:02 +0100 |
| commit | dcaf2511d7a17ab34444ae74b31594ca30a65ff5 (patch) | |
| tree | 1d8bb85744247775f6ccf49c6035fd7332f48952 /gnu/packages/patches | |
| parent | 447260319b645e2e8d06817c9de2cded1cf6b32b (diff) | |
| download | guix-dcaf2511d7a17ab34444ae74b31594ca30a65ff5.tar guix-dcaf2511d7a17ab34444ae74b31594ca30a65ff5.tar.gz | |
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')
| -rw-r--r-- | gnu/packages/patches/luajit-no_ldconfig.patch | 31 | ||||
| -rw-r--r-- | gnu/packages/patches/luajit-symlinks.patch | 25 |
2 files changed, 56 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 + diff --git a/gnu/packages/patches/luajit-symlinks.patch b/gnu/packages/patches/luajit-symlinks.patch new file mode 100644 index 0000000000..2466c34144 --- /dev/null +++ b/gnu/packages/patches/luajit-symlinks.patch @@ -0,0 +1,25 @@ +From 0a54a8f125d7ab508c7c88d5ad4ed1b0c63cb5b6 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:32:55 +0100 +Subject: [PATCH 1/2] Provide two symlinks for dynamic library during install + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 0891b71..343ecb5 100644 +--- a/Makefile ++++ b/Makefile +@@ -56,7 +56,7 @@ INSTALL_PCNAME= luajit.pc + INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) + INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) + INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) +-INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) ++INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT).$(MAJVER) + INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) + INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) + INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) +-- +2.2.2 + |