From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/1] gnu: lua: Build with dynamic library support. Date: Mon, 26 Oct 2015 23:56:09 -0400 Message-ID: <45ab1898e5c08ef1f8c7070eae77c58e5dd40296.1445918045.git.leo@famulari.name> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqvN3-0003g4-6o for guix-devel@gnu.org; Mon, 26 Oct 2015 23:56:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqvMx-00036R-Ki for guix-devel@gnu.org; Mon, 26 Oct 2015 23:56:25 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:41676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqvMx-00036L-Gh for guix-devel@gnu.org; Mon, 26 Oct 2015 23:56:19 -0400 Received: from jasmine.lan (c-69-249-5-231.hsd1.pa.comcast.net [69.249.5.231]) by mail.messagingengine.com (Postfix) with ESMTPA id 855A3680133 for ; Mon, 26 Oct 2015 23:56:16 -0400 (EDT) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/lua.scm (lua, lua-5.1)[arguments]: Set the make flags properly for each version of lua. --- gnu/packages/lua.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 87f53d1..7699a91 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -24,6 +24,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages readline)) @@ -47,7 +48,7 @@ #:test-target "test" #:phases (alist-replace 'build - (lambda _ (zero? (system* "make" "CFLAGS=-fPIC" "linux"))) + (lambda _ (zero? (system* "make" "MYCFLAGS=-fPIC" "linux"))) (alist-replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -77,7 +78,23 @@ for configuration, scripting, and rapid prototyping.") version ".tar.gz")) (sha256 (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16")) - (patches (list (search-patch "lua51-liblua-so.patch"))))))) + (patches (list (search-patch "lua51-liblua-so.patch"))))) + (arguments + (substitute-keyword-arguments (package-arguments lua) + ((#:phases lua-phases) + `(modify-phases ,lua-phases + (replace + 'build + (lambda _ + (and + (zero? (system* "make" (string-append + "MYCFLAGS=" + (string-join '("-fPIC " + "-DLUA_USE_LINUX " + "MYLIBS=-Wl,-E " + "-ldl -lreadline " + "-lhistory -lncurses"))) + "linux"))))))))))) (define-public luajit (package @@ -89,8 +106,8 @@ for configuration, scripting, and rapid prototyping.") version ".tar.gz")) (sha256 (base32 "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm")) - (patches (list (search-patch "luajit-symlinks.patch") - (search-patch "luajit-no_ldconfig.patch"))))) + (patches (list (search-patch "luajit-symlinks.patch") + (search-patch "luajit-no_ldconfig.patch"))))) (build-system gnu-build-system) (arguments '(#:tests? #f ;luajit is distributed without tests -- 2.6.1