Date: Fri, 18 Sep 2020 22:03:42 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548921 - in head/devel/nasm: . files Message-ID: <202009182203.08IM3guI027367@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Fri Sep 18 22:03:42 2020 New Revision: 548921 URL: https://svnweb.freebsd.org/changeset/ports/548921 Log: devel/nasm: Update to 2.15.05 update devel/nasm to 2.15.05 Add upstream patch to fix circular dependency in make. Add perl as a build time dependency, it is needed now. Disable RDOFF in the default package, since it is going away upstream Added: head/devel/nasm/files/patch-d85890aa.c (contents, props changed) Modified: head/devel/nasm/Makefile head/devel/nasm/distinfo Modified: head/devel/nasm/Makefile ============================================================================== --- head/devel/nasm/Makefile Fri Sep 18 21:41:18 2020 (r548920) +++ head/devel/nasm/Makefile Fri Sep 18 22:03:42 2020 (r548921) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nasm -PORTVERSION= 2.15.03 +PORTVERSION= 2.15.05 PORTEPOCH= 1 CATEGORIES= devel lang MASTER_SITES= https://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/ \ @@ -16,12 +16,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_func_strspn=yes -USES= compiler:c11 tar:xz gmake +USES= compiler:c11 tar:xz gmake perl5 +USE_PERL5= build MAKE_ARGS+= INSTALLROOT=${STAGEDIR} INSTALL_TARGET= install #needed for RDOFF_INSTALL_TARGET OPTIONS_DEFINE= RDOFF DOCS -OPTIONS_DEFAULT=RDOFF OPTIONS_SUB= yes RDOFF_DESC= Install tools to handle RDOFF object files Modified: head/devel/nasm/distinfo ============================================================================== --- head/devel/nasm/distinfo Fri Sep 18 21:41:18 2020 (r548920) +++ head/devel/nasm/distinfo Fri Sep 18 22:03:42 2020 (r548921) @@ -1,5 +1,5 @@ -TIMESTAMP = 1595320310 -SHA256 (nasm-2.15.03.tar.xz) = c0c39a305f08ccf0c5c6edba4294dd2851b3925b6d9642dd1efd62f72829822f -SIZE (nasm-2.15.03.tar.xz) = 984060 -SHA256 (nasm-2.15.03-xdoc.tar.xz) = b146a1983fad94690286d01b80024b80b87dff373bc6d7c8c60d65732669cd77 -SIZE (nasm-2.15.03-xdoc.tar.xz) = 816872 +TIMESTAMP = 1600344380 +SHA256 (nasm-2.15.05.tar.xz) = 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f +SIZE (nasm-2.15.05.tar.xz) = 995732 +SHA256 (nasm-2.15.05-xdoc.tar.xz) = 02a260cabb649bf55a06e3dc5abb1413746704156c80afc742b8fc1510262ed1 +SIZE (nasm-2.15.05-xdoc.tar.xz) = 823612 Added: head/devel/nasm/files/patch-d85890aa.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/nasm/files/patch-d85890aa.c Fri Sep 18 22:03:42 2020 (r548921) @@ -0,0 +1,304 @@ +diff --git a/Makefile.in b/Makefile.in +index baca4396..924ba9d6 100644 +--- Makefile.in ++++ Makefile.in +@@ -75,7 +75,7 @@ ifeq ($(TRACE),1) + endif + + .SUFFIXES: +-.SUFFIXES: $(X) .$(O) .$(A) .xml .1 .c .i .s .txt ++.SUFFIXES: $(X) .$(O) .$(A) .xml .1 .c .i .s .txt .time + + .PHONY: all doc rdf install clean distclean cleaner spotless install_rdf test + .PHONY: install_doc everything install_everything strip perlreq dist tags TAGS +@@ -100,7 +100,10 @@ endif + NASM = asm/nasm.$(O) + NDISASM = disasm/ndisasm.$(O) + +-LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ ++PROGOBJ = $(NASM) $(NDISASM) ++PROGS = nasm$(X) ndisasm$(X) ++ ++LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ + stdlib/strnlen.$(O) stdlib/strrchrnul.$(O) \ + \ + nasmlib/ver.$(O) \ +@@ -122,7 +125,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ + x86/regs.$(O) x86/regvals.$(O) x86/regflags.$(O) x86/regdis.$(O) \ + x86/disp8.$(O) x86/iflag.$(O) \ + \ +- asm/error.$(O) asm/warnings.$(O) \ ++ asm/error.$(O) \ + asm/floats.$(O) \ + asm/directiv.$(O) asm/directbl.$(O) \ + asm/pragma.$(O) \ +@@ -147,7 +150,12 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \ + \ + disasm/disasm.$(O) disasm/sync.$(O) + +-ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ) ++# Warnings depend on all source files, so handle them separately ++WARNOBJ = asm/warnings.$(O) ++ ++LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ) ++ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW) ++ALLOBJ = $(PROGOBJ) $(LIBOBJ) + + SUBDIRS = stdlib nasmlib output asm disasm x86 common macros + XSUBDIRS = test doc nsis rdoff +@@ -155,7 +163,7 @@ DEPDIRS = . include config x86 rdoff $(SUBDIRS) + #-- End File Lists --# + + all: dirs +- $(MAKE) nasm$(X) ndisasm$(X) rdf ++ $(MAKE) $(PROGS) rdf + + NASMLIB = libnasm.$(A) + +@@ -271,18 +279,30 @@ warnings: + $(RM_F) $(WARNFILES) + $(MAKE) asm/warnings.time + +-asm/warnings.time: $(ALLOBJ:.@OBJEXT@=.c) ++asm/warnings.time: $(ALLOBJ_NW:.$(O)=.c) + : > asm/warnings.time +- $(MAKE) $(WARNFILES) ++ $(MAKE) $(WARNFILES:=.time) + +-asm/warnings.c: asm/warnings.pl asm/warnings.time ++asm/warnings.c.time: asm/warnings.pl asm/warnings.time + $(RUNPERL) $(srcdir)/asm/warnings.pl c asm/warnings.c $(srcdir) ++ : > asm/warnings.c.time ++ ++asm/warnings.c: asm/warnings.c.time ++ @: Side effect + +-include/warnings.h: asm/warnings.pl asm/warnings.time ++include/warnings.h.time: asm/warnings.pl asm/warnings.time + $(RUNPERL) $(srcdir)/asm/warnings.pl h include/warnings.h $(srcdir) ++ : > include/warnings.h.time + +-doc/warnings.src: asm/warnings.pl asm/warnings.time ++include/warnings.h: include/warnings.h.time ++ @: Side effect ++ ++doc/warnings.src.time: asm/warnings.pl asm/warnings.time + $(RUNPERL) $(srcdir)/asm/warnings.pl doc doc/warnings.src $(srcdir) ++ : > doc/warnings.src.time ++ ++doc/warnings.src : doc/warnings.src.time ++ @: Side effect + + # Assembler token hash + asm/tokhash.c: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl \ +@@ -385,10 +405,9 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/version.nsh + # Generated manpages, also pregenerated for distribution + manpages: nasm.1 ndisasm.1 + +-install: nasm$(X) ndisasm$(X) ++install: $(PROGS) + $(MKDIR_P) $(DESTDIR)$(bindir) +- $(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X) +- $(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X) ++ $(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(bindir)/ + $(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 +@@ -397,7 +416,7 @@ clean: + for d in . $(SUBDIRS) $(XSUBDIRS); do \ + $(RM_F) "$$d"/*.$(O) "$$d"/*.s "$$d"/*.i "$$d"/*.$(A) ; \ + done +- $(RM_F) nasm$(X) ndisasm$(X) ++ $(RM_F) $(PROGS) + $(RM_F) nasm-*-installer-*.exe + $(RM_F) tags TAGS + $(RM_F) nsis/arch.nsh +@@ -412,18 +431,18 @@ distclean: clean + done + $(RM_F) test/*.$(O) + $(RM_RF) autom4te*.cache +- $(RM_F) Makefile *.dep asm/warnings.time ++ $(RM_F) Makefile *.dep + + cleaner: clean + $(RM_F) $(PERLREQ) *.1 nasm.spec + $(MAKE) -C doc clean +- $(RM_F) *.dep asm/warnings.time ++ $(RM_F) *.dep */*.time + + spotless: distclean cleaner + $(RM_F) doc/Makefile + + strip: +- $(STRIP) --strip-unneeded nasm$(X) ndisasm$(X) ++ $(STRIP) --strip-unneeded $(PROGS) + + TAGS: + $(RM_F) TAGS +@@ -496,13 +515,13 @@ nasm.spec: nasm.spec.in nasm.spec.sed version.sed perlbreq.si + splint: + splint -weak *.c + +-test: nasm$(X) ++test: $(PROGS) + cd test && $(RUNPERL) performtest.pl --nasm=../nasm *.asm + +-golden: nasm$(X) ++golden: $(PROGS) + cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm + +-travis: nasm$(X) ++travis: $(PROGS) + $(PYTHON3) travis/nasm-t.py run + + # +diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak +index ee2022d3..f0b3944b 100644 +--- Mkfiles/msvc.mak ++++ Mkfiles/msvc.mak +@@ -64,7 +64,10 @@ X = .exe + NASM = asm\nasm.$(O) + NDISASM = disasm\ndisasm.$(O) + +-LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ ++PROGOBJ = $(NASM) $(NDISASM) ++PROGS = nasm$(X) ndisasm$(X) ++ ++LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ + stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) \ + \ + nasmlib\ver.$(O) \ +@@ -86,7 +89,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ + x86\regs.$(O) x86\regvals.$(O) x86\regflags.$(O) x86\regdis.$(O) \ + x86\disp8.$(O) x86\iflag.$(O) \ + \ +- asm\error.$(O) asm\warnings.$(O) \ ++ asm\error.$(O) \ + asm\floats.$(O) \ + asm\directiv.$(O) asm\directbl.$(O) \ + asm\pragma.$(O) \ +@@ -111,7 +114,12 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ + \ + disasm\disasm.$(O) disasm\sync.$(O) + +-ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ) ++# Warnings depend on all source files, so handle them separately ++WARNOBJ = asm\warnings.$(O) ++ ++LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ) ++ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW) ++ALLOBJ = $(PROGOBJ) $(LIBOBJ) + + SUBDIRS = stdlib nasmlib output asm disasm x86 common macros + XSUBDIRS = test doc nsis rdoff +@@ -230,18 +238,30 @@ warnings: + $(RM_F) $(WARNFILES) + $(MAKE) asm\warnings.time + +-asm\warnings.time: $(ALLOBJ:.@OBJEXT@=.c) ++asm\warnings.time: $(ALLOBJ_NW:.$(O)=.c) + : > asm\warnings.time +- $(MAKE) $(WARNFILES) ++ $(MAKE) $(WARNFILES:=.time) + +-asm\warnings.c: asm\warnings.pl asm\warnings.time ++asm\warnings.c.time: asm\warnings.pl asm\warnings.time + $(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir) ++ : > asm\warnings.c.time ++ ++asm\warnings.c: asm\warnings.c.time ++ @: Side effect + +-include\warnings.h: asm\warnings.pl asm\warnings.time ++include\warnings.h.time: asm\warnings.pl asm\warnings.time + $(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h $(srcdir) ++ : > include\warnings.h.time + +-doc\warnings.src: asm\warnings.pl asm\warnings.time ++include\warnings.h: include\warnings.h.time ++ @: Side effect ++ ++doc\warnings.src.time: asm\warnings.pl asm\warnings.time + $(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src $(srcdir) ++ : > doc\warnings.src.time ++ ++doc\warnings.src : doc\warnings.src.time ++ @: Side effect + + # Assembler token hash + asm\tokhash.c: x86\insns.dat x86\regs.dat asm\tokens.dat asm\tokhash.pl \ +diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak +index 9d080290..ab49a3a5 100644 +--- Mkfiles/openwcom.mak ++++ Mkfiles/openwcom.mak +@@ -53,7 +53,10 @@ X = .exe + NASM = asm\nasm.$(O) + NDISASM = disasm\ndisasm.$(O) + +-LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & ++PROGOBJ = $(NASM) $(NDISASM) ++PROGS = nasm$(X) ndisasm$(X) ++ ++LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & + stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) & + & + nasmlib\ver.$(O) & +@@ -75,7 +78,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & + x86\regs.$(O) x86\regvals.$(O) x86\regflags.$(O) x86\regdis.$(O) & + x86\disp8.$(O) x86\iflag.$(O) & + & +- asm\error.$(O) asm\warnings.$(O) & ++ asm\error.$(O) & + asm\floats.$(O) & + asm\directiv.$(O) asm\directbl.$(O) & + asm\pragma.$(O) & +@@ -100,7 +103,12 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & + & + disasm\disasm.$(O) disasm\sync.$(O) + +-ALLOBJ = $(NASM) $(NDISASM) $(LIBOBJ) ++# Warnings depend on all source files, so handle them separately ++WARNOBJ = asm\warnings.$(O) ++ ++LIBOBJ = $(LIBOBJ_NW) $(WARNOBJ) ++ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW) ++ALLOBJ = $(PROGOBJ) $(LIBOBJ) + + SUBDIRS = stdlib nasmlib output asm disasm x86 common macros + XSUBDIRS = test doc nsis rdoff +@@ -243,18 +251,30 @@ warnings: + $(RM_F) $(WARNFILES) + $(MAKE) asm\warnings.time + +-asm\warnings.time: $(ALLOBJ:.@OBJEXT@=.c) ++asm\warnings.time: $(ALLOBJ_NW:.$(O)=.c) + : > asm\warnings.time +- $(MAKE) $(WARNFILES) ++ $(MAKE) $(WARNFILES:=.time) + +-asm\warnings.c: asm\warnings.pl asm\warnings.time ++asm\warnings.c.time: asm\warnings.pl asm\warnings.time + $(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings.c $(srcdir) ++ : > asm\warnings.c.time ++ ++asm\warnings.c: asm\warnings.c.time ++ @: Side effect + +-include\warnings.h: asm\warnings.pl asm\warnings.time ++include\warnings.h.time: asm\warnings.pl asm\warnings.time + $(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h $(srcdir) ++ : > include\warnings.h.time + +-doc\warnings.src: asm\warnings.pl asm\warnings.time ++include\warnings.h: include\warnings.h.time ++ @: Side effect ++ ++doc\warnings.src.time: asm\warnings.pl asm\warnings.time + $(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src $(srcdir) ++ : > doc\warnings.src.time ++ ++doc\warnings.src : doc\warnings.src.time ++ @: Side effect + + # Assembler token hash + asm\tokhash.c: x86\insns.dat x86\regs.dat asm\tokens.dat asm\tokhash.pl &
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009182203.08IM3guI027367>