efraim pushed a commit to branch master
in repository guix.

commit 161fb9be8edf37cf52c3d223214d81e4cbb7a787
Author: Efraim Flashner <efr...@flashner.co.il>
Date:   Thu Dec 1 10:47:29 2016 +0200

    gnu: nasm: Switch patch to phase.
    
    * gnu/packages/assembly.scm (nasm)[source]: Remove patch.
    [arguments]: Disable ps and pdf doc outputs in new phase.
    * gnu/packages/patches/nasm-no-ps-pdf.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                              |    1 -
 gnu/packages/assembly.scm                 |   20 ++++++++++++++------
 gnu/packages/patches/nasm-no-ps-pdf.patch |   20 --------------------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 219d82a..0f70a08 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -748,7 +748,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
   %D%/packages/patches/musl-CVE-2016-8859.patch                        \
   %D%/packages/patches/mutt-store-references.patch             \
-  %D%/packages/patches/nasm-no-ps-pdf.patch                    \
   %D%/packages/patches/net-tools-bitrot.patch                  \
   %D%/packages/patches/netcdf-config-date.patch                        \
   %D%/packages/patches/netsurf-about.patch                     \
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index a6e4abb..dd675ed 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -41,17 +41,25 @@
                                   version "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "12bl6vc5sjp9nnhf0iwy6l27vq783y0rxrjpp8sy84h5cb7a3fwx"))
-              (patches (search-patches "nasm-no-ps-pdf.patch"))))
+                "12bl6vc5sjp9nnhf0iwy6l27vq783y0rxrjpp8sy84h5cb7a3fwx"))))
     (build-system gnu-build-system)
     (native-inputs `(("perl" ,perl)  ;for doc and test target
                      ("texinfo" ,texinfo)))
     (arguments
      `(#:test-target "test"
-       #:phases (modify-phases %standard-phases
-                  (add-after 'install 'install-info
-                    (lambda _
-                      (zero? (system* "make" "install_doc")))))))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'dont-build-ps-pdf-outputs
+           (lambda _
+             (substitute* "doc/Makefile.in"
+               (("info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf")
+                "info html nasmdoc.txt")
+               (("nasmdoc.ps nasmdoc.pdf nasmdoc.txt 
\\$\\(INSTALLROOT\\)\\$\\(docdir\\)")
+                "nasmdoc.txt $(INSTALLROOT)$(docdir)"))
+             #t))
+         (add-after 'install 'install-info
+           (lambda _
+             (zero? (system* "make" "install_doc")))))))
     (home-page "http://www.nasm.us/";)
     (synopsis "80x86 and x86-64 assembler")
     (description
diff --git a/gnu/packages/patches/nasm-no-ps-pdf.patch 
b/gnu/packages/patches/nasm-no-ps-pdf.patch
deleted file mode 100644
index b03b57a..0000000
--- a/gnu/packages/patches/nasm-no-ps-pdf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Avoid building PS and PDF docs, which do not build bit-reproducible.  NASM
-already installs doc in info and html.
-
---- nasm-2.12.01/doc/Makefile.in.orig  2016-06-21 18:02:59.483484829 +0200
-+++ nasm-2.12.01/doc/Makefile.in       2016-06-21 18:03:46.700151410 +0200
-@@ -27,7 +27,7 @@
- PS2PDF          = @PS2PDF@            # Part of GhostScript
- 
- SRCS          = nasmdoc.src inslist.src changes.src
--OUT           = info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf
-+OUT           = info html nasmdoc.txt
- 
- # exports
- export srcdir
-@@ -100,4 +100,4 @@
-       $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
-       mkdir -p $(INSTALLROOT)$(docdir)/html
-       $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html
--      $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt 
$(INSTALLROOT)$(docdir)
-+      $(INSTALL_DATA) nasmdoc.txt $(INSTALLROOT)$(docdir)

Reply via email to