mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-lang/nasm: drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
Sergei Trofimovich
@@ -1,4 +1 @@
|
||||
DIST nasm-2.13.01.tar.xz 800244 BLAKE2B 23a42d9e6c66577cee0e3b6cdff8da7b7b49286011f2d9e2319bd229ca0a1ab5b89a27d71a591777430e577175c935ba2a34b7ba0ca6086853f84fa5f0f648ab SHA512 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae
|
||||
DIST nasm-2.13.03.tar.xz 806636 BLAKE2B 36187dac080dac17efbc1a2319d989bcb0f883fee80668656a6a87bdd83ee4115ffa2f8519f6d267815590f4809aa293aac500f3a5505a391154cb460cbe94ad SHA512 24e6c72b80a878453baf3b525c1bad607431ff672a927f73e742379fa833b3f5d3fa4479addfcec6d96f354aa90a45905ff9c76ab5217c3bcb7091107b32e2b5
|
||||
DIST nasm-2.14.02.tar.xz 827620 BLAKE2B deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4 SHA512 c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81
|
||||
DIST nasm-2.14.tar.xz 824780 BLAKE2B c246a357896414aa370ded6e42d076d4d56db62e6519cb421000696d65c6e7581f8e0c3c5d55fb27c876139c368bb739863bb5fc0f9bd76610b054f31ec83b5f SHA512 0f7f1b8b0cd4ac62df1dc203789b74670ebe10f3be10af9984331b1c348745ed31a43aca77c5c771016a718fa2c7c8805c1c9edfdd6b0fe83ee0937cb0dd3d23
|
||||
|
||||
@@ -1,177 +0,0 @@
|
||||
From 1c369c46fd2cceeb6abe46b89fc539960a6c0c88 Mon Sep 17 00:00:00 2001
|
||||
From: David Seifert <soap@gentoo.org>
|
||||
Date: Sat, 1 Jul 2017 19:42:50 -0700
|
||||
Subject: [PATCH] Make buildsystem respect GNU conventions
|
||||
|
||||
* CPPFLAGS is a user variable and should be respected
|
||||
when compiling .c files. Think of -D_FORTIFY_SOURCE=2.
|
||||
* Pass ALL_CFLAGS when linking too. This is recommended
|
||||
for certain edge cases (-flto)
|
||||
* Use DESTDIR instead of INSTALLROOT for staging dir
|
||||
Every other build system (Automake, CMake, Meson) uses
|
||||
DESTDIR. This integrates better into distro and other
|
||||
build systems that have standard hooks for DESTDIR.
|
||||
* $(MAKE) -C <dir> is better than cd'ing into a <dir>
|
||||
* Use Autoconf's ${docdir} and ${htmldir} for installing
|
||||
the documentation. This makes handling documentation
|
||||
easier and respects user choice.
|
||||
---
|
||||
Makefile.in | 41 +++++++++++++++++++++--------------------
|
||||
doc/Makefile.in | 13 ++++++++-----
|
||||
2 files changed, 29 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index a48d980..e7f01e4 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -20,6 +20,7 @@ datarootdir = @datarootdir@
|
||||
|
||||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@
|
||||
+CPPFLAGS = @CPPFLAGS@
|
||||
BUILD_CFLAGS = $(CFLAGS) @DEFS@
|
||||
INTERNAL_CFLAGS = -I$(srcdir) -I$(objdir) \
|
||||
-I$(srcdir)/include -I$(objdir)/include \
|
||||
@@ -72,13 +73,13 @@ endif
|
||||
.PHONY: manpages nsis
|
||||
|
||||
.c.$(O):
|
||||
- $(CC) -c $(ALL_CFLAGS) -o $@ $<
|
||||
+ $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
|
||||
|
||||
.c.s:
|
||||
- $(CC) -S $(ALL_CFLAGS) -o $@ $<
|
||||
+ $(CC) -S $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
|
||||
|
||||
.c.i:
|
||||
- $(CC) -E $(ALL_CFLAGS) -o $@ $<
|
||||
+ $(CC) -E $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
|
||||
|
||||
.txt.xml:
|
||||
$(ASCIIDOC) -b docbook -d manpage -o $@ $<
|
||||
@@ -88,7 +89,7 @@ endif
|
||||
|
||||
# This rule is only used for rdoff, to allow common rules
|
||||
.$(O)$(X):
|
||||
- $(CC) $(LDFLAGS) -o $@ $< $(RDFLIB) $(NASMLIB) $(LIBS)
|
||||
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $< $(RDFLIB) $(NASMLIB) $(LIBS)
|
||||
|
||||
#-- Begin File Lists --#
|
||||
NASM = asm/nasm.$(O)
|
||||
@@ -152,10 +153,10 @@ $(NASMLIB): $(LIBOBJ)
|
||||
$(RANLIB) $(NASMLIB)
|
||||
|
||||
nasm$(X): $(NASM) $(NASMLIB)
|
||||
- $(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(NASMLIB) $(LIBS)
|
||||
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o nasm$(X) $(NASM) $(NASMLIB) $(LIBS)
|
||||
|
||||
ndisasm$(X): $(NDISASM) $(NASMLIB)
|
||||
- $(CC) $(LDFLAGS) -o ndisasm$(X) $(NDISASM) $(NASMLIB) $(LIBS)
|
||||
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o ndisasm$(X) $(NDISASM) $(NASMLIB) $(LIBS)
|
||||
|
||||
#-- Begin Generated File Rules --#
|
||||
|
||||
@@ -335,12 +336,12 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/version.nsh
|
||||
manpages: nasm.1 ndisasm.1
|
||||
|
||||
install: nasm$(X) ndisasm$(X)
|
||||
- $(MKDIR) -p $(INSTALLROOT)$(bindir)
|
||||
- $(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X)
|
||||
- $(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X)
|
||||
- $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1
|
||||
- $(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1
|
||||
- $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
|
||||
+ $(MKDIR) -p $(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
|
||||
|
||||
clean:
|
||||
for d in . $(SUBDIRS) $(XSUBDIRS); do \
|
||||
@@ -364,7 +365,7 @@ distclean: clean
|
||||
|
||||
cleaner: clean
|
||||
$(RM_F) $(PERLREQ) *.1 nasm.spec
|
||||
- cd doc && $(MAKE) clean
|
||||
+ $(MAKE) -C doc clean
|
||||
|
||||
spotless: distclean cleaner
|
||||
$(RM_F) doc/Makefile
|
||||
@@ -386,23 +387,23 @@ cscope:
|
||||
cscope -b -f cscope.out
|
||||
|
||||
rdf_install install_rdf install_rdoff:
|
||||
- $(MKDIR) -p $(INSTALLROOT)$(bindir)
|
||||
+ $(MKDIR) -p $(DESTDIR)$(bindir)
|
||||
for f in $(RDFPROGS); do \
|
||||
- $(INSTALL_PROGRAM) "$$f" '$(INSTALLROOT)$(bindir)'/ ; \
|
||||
+ $(INSTALL_PROGRAM) "$$f" '$(DESTDIR)$(bindir)'/ ; \
|
||||
done
|
||||
- cd '$(INSTALLROOT)$(bindir)' && \
|
||||
+ cd '$(DESTDIR)$(bindir)' && \
|
||||
for f in $(RDF2BINLINKS); do \
|
||||
bn=`basename "$$f"` && $(RM_F) "$$bn" && \
|
||||
$(LN_S) rdf2bin$(X) "$$bn" ; \
|
||||
done
|
||||
- $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1
|
||||
- $(INSTALL_DATA) $(srcdir)/rdoff/*.1 $(INSTALLROOT)$(mandir)/man1/
|
||||
+ $(MKDIR) -p $(DESTDIR)$(mandir)/man1
|
||||
+ $(INSTALL_DATA) $(srcdir)/rdoff/*.1 $(DESTDIR)$(mandir)/man1/
|
||||
|
||||
doc:
|
||||
- cd doc && $(MAKE) all
|
||||
+ $(MAKE) -C doc all
|
||||
|
||||
doc_install install_doc:
|
||||
- cd doc && $(MAKE) install
|
||||
+ $(MAKE) -C doc install
|
||||
|
||||
everything: all manpages doc rdf
|
||||
|
||||
diff --git a/doc/Makefile.in b/doc/Makefile.in
|
||||
index 2ddfd1e..261a791 100644
|
||||
--- a/doc/Makefile.in
|
||||
+++ b/doc/Makefile.in
|
||||
@@ -9,7 +9,8 @@ prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
mandir = @mandir@
|
||||
-docdir = $(prefix)/doc/nasm
|
||||
+docdir = @docdir@
|
||||
+htmldir = @htmldir@
|
||||
infodir = @infodir@
|
||||
datarootdir = @datarootdir@
|
||||
|
||||
@@ -21,6 +22,7 @@ PERL = perl -I$(srcdir)
|
||||
|
||||
PDFOPT = @PDFOPT@
|
||||
|
||||
+MKDIR = mkdir
|
||||
RM_F = rm -f
|
||||
RM_RF = rm -rf
|
||||
CP_F = cp -f
|
||||
@@ -41,7 +43,7 @@ inslist.src: inslist.pl ../x86/insns.dat
|
||||
|
||||
.PHONY: html
|
||||
html: $(HTMLAUX)
|
||||
- mkdir -p html
|
||||
+ $(MKDIR) -p html
|
||||
for f in $(HTMLAUX); do $(CP_UF) "$(srcdir)/$$f" html/; done
|
||||
$(MAKE) html/nasmdoc0.html
|
||||
|
||||
@@ -81,6 +83,7 @@ spotless: clean
|
||||
-$(RM_F) *.hlp nasmdoc.txt *.inf *.pdf *.dvi
|
||||
|
||||
install: all
|
||||
- mkdir -p $(INSTALLROOT)$(docdir)/html
|
||||
- $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html
|
||||
- $(INSTALL_DATA) nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir)
|
||||
+ $(MKDIR) -p $(DESTDIR)$(htmldir)
|
||||
+ $(INSTALL_DATA) html/* $(DESTDIR)$(htmldir)
|
||||
+ $(MKDIR) -p $(DESTDIR)$(docdir)
|
||||
+ $(INSTALL_DATA) nasmdoc.pdf nasmdoc.txt $(DESTDIR)$(docdir)
|
||||
--
|
||||
2.13.2
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 5eb1838b4d3752fd863d19442943983a2a5ee87c Mon Sep 17 00:00:00 2001
|
||||
From: Cyrill Gorcunov <gorcunov@gmail.com>
|
||||
Date: Sat, 10 Feb 2018 00:33:41 +0300
|
||||
Subject: [PATCH] nasmlib: Drop unused seg_init
|
||||
|
||||
The helper has been eliminated in 2c4a4d5810d0a59b033a07876a2648ef5d4c2859
|
||||
|
||||
https://bugzilla.nasm.us/show_bug.cgi?id=3392461
|
||||
|
||||
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
|
||||
---
|
||||
include/nasmlib.h | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/include/nasmlib.h b/include/nasmlib.h
|
||||
index 79e866b5..fee1b5ea 100644
|
||||
--- a/include/nasmlib.h
|
||||
+++ b/include/nasmlib.h
|
||||
@@ -191 +190,0 @@ int64_t readstrnum(char *str, int length, bool *warn);
|
||||
- * seg_init: Initialise the segment-number allocator.
|
||||
@@ -194 +192,0 @@ int64_t readstrnum(char *str, int length, bool *warn);
|
||||
-void pure_func seg_init(void);
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
https://bugzilla.nasm.us/show_bug.cgi?id=3392529
|
||||
https://bugs.gentoo.org/670944
|
||||
|
||||
From 7b6371b9d35705ee3800082ca245f8dd289bb216 Mon Sep 17 00:00:00 2001
|
||||
From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
|
||||
Date: Tue, 20 Nov 2018 10:56:57 -0800
|
||||
Subject: [PATCH] BR 3392529: if the default output name is the same as input
|
||||
-> nasm.out
|
||||
|
||||
If no output filename is specified, then a default filename is used
|
||||
based on the input filename. If that ends up the *same* as the input
|
||||
filename, change the output filename to "nasm.out".
|
||||
|
||||
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
|
||||
---
|
||||
asm/nasm.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/asm/nasm.c
|
||||
+++ b/asm/nasm.c
|
||||
@@ -514,9 +514,14 @@ int main(int argc, char **argv)
|
||||
* is a preprocess mode, we're perfectly
|
||||
* fine to output into stdout.
|
||||
*/
|
||||
- if (!outname) {
|
||||
- if (!(operating_mode & OP_PREPROCESS))
|
||||
- outname = filename_set_extension(inname, ofmt->extension);
|
||||
+ if (!outname && !(operating_mode & OP_PREPROCESS)) {
|
||||
+ outname = filename_set_extension(inname, ofmt->extension);
|
||||
+ if (!strcmp(outname, inname)) {
|
||||
+ outname = "nasm.out";
|
||||
+ nasm_error(ERR_WARNING,
|
||||
+ "default output file same as input, using `%s' for output\n",
|
||||
+ inname, outname);
|
||||
+ }
|
||||
}
|
||||
|
||||
depend_ptr = (depend_file || (operating_mode & OP_DEPEND))
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="groovy little assembler"
|
||||
HOMEPAGE="https://www.nasm.us/"
|
||||
SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND="
|
||||
dev-lang/perl
|
||||
doc? (
|
||||
app-text/ghostscript-gpl
|
||||
dev-perl/Font-TTF
|
||||
dev-perl/Sort-Versions
|
||||
media-fonts/clearsans
|
||||
virtual/perl-File-Spec
|
||||
)
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${P/_}
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch
|
||||
"${FILESDIR}"/${PN}-2.13.01-gcc-8.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
use doc && emake doc
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="groovy little assembler"
|
||||
HOMEPAGE="https://www.nasm.us/"
|
||||
SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ia64 ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE="doc"
|
||||
|
||||
# [fonts note] doc/psfonts.ph defines ordered list of font preference.
|
||||
# Currently 'media-fonts/source-pro' is most preferred and is able to
|
||||
# satisfy all 6 font flavours: tilt, chapter, head, etc.
|
||||
DEPEND="
|
||||
dev-lang/perl
|
||||
doc? (
|
||||
app-text/ghostscript-gpl
|
||||
dev-perl/Font-TTF
|
||||
dev-perl/Sort-Versions
|
||||
media-fonts/source-pro
|
||||
virtual/perl-File-Spec
|
||||
)
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${P/_}
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.13.01-fix-docdir.patch
|
||||
"${FILESDIR}"/${PN}-2.13.01-gcc-8.patch
|
||||
"${FILESDIR}"/${PN}-2.13.03-bsd-cp-doc.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
use doc && emake doc
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="groovy little assembler"
|
||||
HOMEPAGE="https://www.nasm.us/"
|
||||
SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ia64 ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND=""
|
||||
# [fonts note] doc/psfonts.ph defines ordered list of font preference.
|
||||
# Currently 'media-fonts/source-pro' is most preferred and is able to
|
||||
# satisfy all 6 font flavours: tilt, chapter, head, etc.
|
||||
BDEPEND="
|
||||
dev-lang/perl
|
||||
doc? (
|
||||
app-text/ghostscript-gpl
|
||||
dev-perl/Font-TTF
|
||||
dev-perl/Sort-Versions
|
||||
media-fonts/source-pro
|
||||
virtual/perl-File-Spec
|
||||
)
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${P/_}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.13.03-bsd-cp-doc.patch
|
||||
"${FILESDIR}"/${P}-default-path-BR-3392529.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
use doc && emake doc
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
|
||||
}
|
||||
Reference in New Issue
Block a user