From patchwork Sun Feb 17 19:22:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 1130 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 52A5116C4B; Sun, 17 Feb 2019 19:25:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D03D516C4A for ; Sun, 17 Feb 2019 19:25:31 +0000 (GMT) Received: from localhost ([127.0.0.1]:45648 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvS4B-0002KD-8A for patchwork@mira.cbaines.net; Sun, 17 Feb 2019 14:25:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvS30-0001Fw-Bl for guix-patches@gnu.org; Sun, 17 Feb 2019 14:24:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvS2r-0007fK-8f for guix-patches@gnu.org; Sun, 17 Feb 2019 14:24:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvS2q-0007dJ-SS for guix-patches@gnu.org; Sun, 17 Feb 2019 14:24:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gvS2q-00077D-Nc for guix-patches@gnu.org; Sun, 17 Feb 2019 14:24:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34514] [PATCH 17/34] gnu: sassc: Update and improve the package. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Feb 2019 19:24:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34514 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34514@debbugs.gnu.org Received: via spool by 34514-submit@debbugs.gnu.org id=B34514.155043141027070 (code B ref 34514); Sun, 17 Feb 2019 19:24:08 +0000 Received: (at 34514) by debbugs.gnu.org; 17 Feb 2019 19:23:30 +0000 Received: from localhost ([127.0.0.1]:51611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvS2D-00072S-OF for submit@debbugs.gnu.org; Sun, 17 Feb 2019 14:23:30 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:47226 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gvS20-0006y7-Ui for 34514@debbugs.gnu.org; Sun, 17 Feb 2019 14:23:19 -0500 Received: from localhost (130.85.159.143.dyn.plus.net [143.159.85.130]) by mira.cbaines.net (Postfix) with ESMTPSA id A749B16C61 for <34514@debbugs.gnu.org>; Sun, 17 Feb 2019 19:23:15 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id acb3501a for <34514@debbugs.gnu.org>; Sun, 17 Feb 2019 19:23:14 +0000 (UTC) From: Christopher Baines Date: Sun, 17 Feb 2019 19:22:57 +0000 Message-Id: <20190217192314.5666-17-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190217192314.5666-1-mail@cbaines.net> References: <87sgwm44a9.fsf@cbaines.net> <20190217192314.5666-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Now that libsass is packaged, change the sassc package to build a dynamically linked binary. Also update the version, and change the source to the Git repository, rather than the archives from GitHub. * gnu/packages/web.scm (sassc): Update to 3.5.0. [source]: Change to the Git repository. [arguments]: Tweak to link against libsass. --- gnu/packages/web.scm | 95 +++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ed2a7df2e1..49fbfd1f8d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1284,56 +1284,53 @@ stylesheets, you'll need to use another program that uses this library, (license l:expat))) (define-public sassc - ;; libsass must be statically linked and it isn't included in the sassc - ;; release tarballs, hence this odd package recipe. - (let* ((version "3.4.5") - (libsass - (origin - (method url-fetch) - (uri (string-append - "https://github.com/sass/libsass/archive/" - version ".tar.gz")) - (file-name (string-append "libsass-" version ".tar.gz")) - (sha256 - (base32 - "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x"))))) - (package - (name "sassc") - (version version) - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/sass/sassc/archive/" - version ".tar.gz")) - (file-name (string-append "sassc-" version ".tar.gz")) - (sha256 - (base32 - "1xk4kmmvziz9sal3swpqa10q0s289xjpcz8aggmly8mvxvmngsi9")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:test-target "test" - ;; FIXME: "make test" rebuilds the application and gets lost in a - ;; non-existing directory. - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'bootstrap) - (delete 'configure) - (add-after 'unpack 'unpack-libsass-and-set-path - (lambda* (#:key inputs #:allow-other-keys) - (invoke "tar" "xvf" (assoc-ref inputs "libsass")) - (setenv "SASS_LIBSASS_PATH" - (string-append (getcwd) "/libsass-" ,version)) - #t))))) - (inputs - `(("libsass" ,libsass))) - (synopsis "CSS pre-processor") - (description "SassC is a compiler written in C for the CSS pre-processor + (package + (name "sassc") + (version "3.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sass/sassc.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jsfz1zg4gwk0dq8i92ll12axs3s70wsdsmdyi71zx8zmvib5nl6")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + ;; I don't believe sassc contains any tests + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-Makefile + (lambda _ + (substitute* "Makefile" + (("build-shared: \\$\\(RESOURCES\\) \\$\\(OBJECTS\\) \\$\\(LIB_SHARED\\)") + "build-shared: $(RESOURCES) $(OBJECTS)") + (("\\$\\(SASSC_EXE\\): libsass build") + "$(SASSC_EXE): build") + (("install: libsass-install-\\$\\(BUILD\\) \\\\") + "install: \\")) + #t)) + ;; This phase fails for some reason + (delete 'bootstrap) + ;; There is no configure script + (delete 'configure) + (add-before 'build 'setup-environment + (lambda _ + (setenv "BUILD" "shared") + (setenv "SASSC_VERSION" ,version) + #t))))) + (inputs + `(("libsass" ,libsass))) + (synopsis "CSS pre-processor") + (description "SassC is a compiler written in C for the CSS pre-processor language known as SASS.") - (home-page "http://sass-lang.com/libsass") - (license l:expat)))) + (home-page "http://sass-lang.com/libsass") + (license l:expat))) (define-public perl-apache-logformat-compiler