Update to nasm-2.16.01.

This commit is contained in:
Jonas 'Sortie' Termansen 2024-01-28 18:11:19 +01:00
parent 71bdc34ab7
commit e6aa160df4
3 changed files with 44 additions and 31 deletions

View File

@ -1,31 +1,45 @@
diff -Paur --no-dereference -- nasm.upstream/Makefile.in nasm/Makefile.in diff -Paur --no-dereference -- nasm.upstream/doc/Makefile nasm/doc/Makefile
--- nasm.upstream/Makefile.in --- nasm.upstream/doc/Makefile
+++ nasm/Makefile.in +++ nasm/doc/Makefile
@@ -201,12 +201,12 @@ @@ -7,8 +7,8 @@
manpages: nasm.1 ndisasm.1 top_srcdir = ..
srcdir = .
install: nasm$(X) ndisasm$(X) -prefix = /usr/local
- $(MKDIR) -p $(INSTALLROOT)$(bindir) -exec_prefix = ${prefix}
- $(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X) +prefix =
- $(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X) +exec_prefix =
- $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1 bindir = ${exec_prefix}/bin
- $(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1 mandir = ${datarootdir}/man
- $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1 docdir = ${datarootdir}/doc/${PACKAGE}
+ $(MKDIR) -p $(DESTDIR)$(bindir) @@ -16,7 +16,7 @@
+ $(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X) infodir = ${datarootdir}/info
+ $(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X) datarootdir = ${prefix}/share
+ $(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
clean: -INSTALL = /bin/install -c
$(RM) -f *.$(O) *.s *.i +INSTALL = /usr/bin/install -c
@@ -218,7 +218,7 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
distclean: clean @@ -24,7 +24,7 @@
$(RM) -f config.h config.log config.status
- $(RM) -f Makefile *~ *.bak *.lst *.bin PDFOPT =
+ $(RM) -f Makefile doc/Makefile *~ *.bak *.lst *.bin
$(RM) -f output/*~ output/*.bak -MKDIR_P = /bin/mkdir -p
$(RM) -f test/*.lst test/*.bin test/*.$(O) test/*.bin +MKDIR_P = /usr/bin/mkdir -p
$(RM) -rf autom4te*.cache RM_F = rm -f
RM_RF = rm -rf
CP_F = cp -f
diff -Paur --no-dereference -- nasm.upstream/include/compiler.h nasm/include/compiler.h
--- nasm.upstream/include/compiler.h
+++ nasm/include/compiler.h
@@ -412,4 +412,9 @@
# define default case BOGUS_CASE: default
#endif
+/* PATCH: Sortix doesn't have FILENAME_MAX at this time. */
+#if !defined(FILENAME_MAX) && defined(__sortix__)
+#define FILENAME_MAX 256
+#endif
+
#endif /* NASM_COMPILER_H */

View File

@ -1,10 +1,10 @@
NAME=nasm NAME=nasm
BUILD_LIBRARIES= BUILD_LIBRARIES=
VERSION=2.11.02 VERSION=2.16.01
DISTNAME=$NAME-$VERSION DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz COMPRESSION=tar.xz
ARCHIVE=$DISTNAME.$COMPRESSION ARCHIVE=$DISTNAME.$COMPRESSION
SHA256SUM=233c574f2c068c0256f9b3653220ceb247c72b671085595259529156c6cfa55d SHA256SUM=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
UPSTREAM_SITE=https://www.nasm.us/pub/nasm/releasebuilds/$VERSION UPSTREAM_SITE=https://www.nasm.us/pub/nasm/releasebuilds/$VERSION
UPSTREAM_ARCHIVE=$ARCHIVE UPSTREAM_ARCHIVE=$ARCHIVE
BUILD_SYSTEM=configure BUILD_SYSTEM=configure

View File

@ -1 +0,0 @@
rm -rf -- 'doc/Makefile'