Skip to content

Commit

Permalink
Merge pull request #232 from tomponline/5.0-edge
Browse files Browse the repository at this point in the history
Revert nasm bump (5.0-edge)
  • Loading branch information
tomponline authored Dec 5, 2023
2 parents b55dd90 + bc4d577 commit cf9e270
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions patches/nasm-0000-disable-manpages.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/Makefile.in b/Makefile.in
index 860d4d26..a6337256 100644
index baca4396..0e739217 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -365,9 +365,6 @@ manpages: nasm.1 ndisasm.1
install: $(PROGS)
@@ -389,9 +389,6 @@ install: nasm$(X) ndisasm$(X)
$(MKDIR_P) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(bindir)/
$(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X)
$(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X)
- $(MKDIR_P) $(DESTDIR)$(mandir)/man1
- $(INSTALL_DATA) $(srcdir)/nasm.1 $(DESTDIR)$(mandir)/man1/nasm.1
- $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(DESTDIR)$(mandir)/man1/ndisasm.1
Expand Down
2 changes: 1 addition & 1 deletion snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ parts:
build-attributes: [core22-step-dependencies]
source: https://github.com/netwide-assembler/nasm
source-type: git
source-tag: nasm-2.16.01
source-tag: nasm-2.15.05
source-depth: 1
plugin: autotools
autotools-configure-parameters:
Expand Down

0 comments on commit cf9e270

Please sign in to comment.