* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nasm/, dev-lang/nasm/files/
@ 2017-07-02 3:05 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-07-02 3:05 UTC (permalink / raw
To: gentoo-commits
commit: b7a831e509fcfc0300fc6d026de2c65934667fe3
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Thu Jun 15 19:14:42 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 03:05:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a831e5
dev-lang/nasm: bump to 2.13.01, EAPI=6, fix doc dependencies
Bug: https://bugs.gentoo.org/show_bug.cgi?id=619360
Closes: https://github.com/gentoo/gentoo/pull/4938
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/nasm/Manifest | 1 +
dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch | 177 ++++++++++++++++++++++
dev-lang/nasm/metadata.xml | 2 +-
dev-lang/nasm/nasm-2.13.01.ebuild | 44 ++++++
4 files changed, 223 insertions(+), 1 deletion(-)
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index cee747eb470..84c99cdef65 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,2 +1,3 @@
DIST nasm-2.11.08.tar.xz 764872 SHA256 c99467c7072211c550d147640d8a1a0aa4d636d4d8cf849f3bf4317d900a1f7f SHA512 f7caf42d0fe1b850de13180a1f363e34a6d44a02696312dd8f12f4116ad1c1f3d01e6606c3a79fb881e76fc70d20894d85b333c84a75d60265ff9551f7b8cde4 WHIRLPOOL d13f342d59aedf2510347f847a2f5fb276a3bdb9e7b8c5cac6ac4e204a03ea31e477adc19facbf68f939245aae72971b232f1a0fc461ef554458f8956403c623
DIST nasm-2.12.01.tar.xz 780112 SHA256 9dbba1ce620512e435ba57e69e811fe8e07d04359e47e0a0b5e94a5dd8367489 SHA512 c016b2b26f2ef00fe8de673dc7b2effa55ddd23d1f15145380c2767a2cd4a5c60c77732faebcd5868b325f780c0bf76a5e0c49eb6189609b21e2493d2af9347c WHIRLPOOL 4659275043c947461a03450efe184a425019aa99b30607c33b1dd302dd02091a9f1dfaf80382c4466b7df295bc09add6ad9587e3050ea4567a4605f956e1bcdd
+DIST nasm-2.13.01.tar.xz 800244 SHA256 aa0213008f0433ecbe07bb628506a5c4be8079be20fc3532a5031fd639db9a5e SHA512 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae WHIRLPOOL dfc7018acfb51cdd3988da6abd157a29d72fdcd233862de4eb09debd65560280a0d7a7aa8f76f0e0c546861272d533f57d3dacd52add16a894dbc026a913d1c5
diff --git a/dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch b/dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch
new file mode 100644
index 00000000000..aaedc404a20
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.13.01-fix-docdir.patch
@@ -0,0 +1,177 @@
+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
+
diff --git a/dev-lang/nasm/metadata.xml b/dev-lang/nasm/metadata.xml
index d1959dc35a8..5f522331eb9 100644
--- a/dev-lang/nasm/metadata.xml
+++ b/dev-lang/nasm/metadata.xml
@@ -15,6 +15,6 @@ Pentium, P6, MMX, 3DNow!, SSE and SSE2 opcodes, and has macro capability.
</longdescription>
<upstream>
<remote-id type="sourceforge">nasm</remote-id>
- <bugs-to>https://bugzilla.nasm.us/</bugs-to>
+ <bugs-to>https://bugzilla.nasm.us/</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/dev-lang/nasm/nasm-2.13.01.ebuild b/dev-lang/nasm/nasm-2.13.01.ebuild
new file mode 100644
index 00000000000..6fc9f52cb0a
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.13.01.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="http://www.nasm.us/"
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-cygwin ~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 )
+
+src_configure() {
+ strip-flags
+ default
+}
+
+src_compile() {
+ default
+ use doc && emake doc
+}
+
+src_install() {
+ default
+ emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nasm/, dev-lang/nasm/files/
@ 2018-12-08 18:54 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-12-08 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 416dae40d938b83ecdc44de5e76f04721d5cf066
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 18:50:01 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 18:54:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416dae40
dev-lang/nasm: backport default filename fix, bug #670944
Pulled upstream fix for input==output for single-argument
invocation from https://bugzilla.nasm.us/show_bug.cgi?id=3392529
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/670944
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/nasm-2.14-default-path-BR-3392529.patch | 41 ++++++++++++++++++++++
.../nasm/{nasm-2.14.ebuild => nasm-2.14-r1.ebuild} | 1 +
2 files changed, 42 insertions(+)
diff --git a/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch b/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch
new file mode 100644
index 00000000000..57cbb741505
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.14-default-path-BR-3392529.patch
@@ -0,0 +1,41 @@
+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
+
diff --git a/dev-lang/nasm/nasm-2.14.ebuild b/dev-lang/nasm/nasm-2.14-r1.ebuild
similarity index 95%
rename from dev-lang/nasm/nasm-2.14.ebuild
rename to dev-lang/nasm/nasm-2.14-r1.ebuild
index 46c8d440a40..7a17a31be97 100644
--- a/dev-lang/nasm/nasm-2.14.ebuild
+++ b/dev-lang/nasm/nasm-2.14-r1.ebuild
@@ -34,6 +34,7 @@ S=${WORKDIR}/${P/_}
PATCHES=(
"${FILESDIR}"/${PN}-2.13.03-bsd-cp-doc.patch
+ "${FILESDIR}"/${P}-default-path-BR-3392529.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nasm/, dev-lang/nasm/files/
@ 2020-06-28 16:15 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-06-28 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 3e6dd877f8a1b5a52da35813ba9518f698d26560
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 16:12:31 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 16:15:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6dd877
dev-lang/nasm: bump up to 2.15
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-lang/nasm/Manifest | 1 +
dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch | 13 +++++++
dev-lang/nasm/nasm-2.15.ebuild | 47 ++++++++++++++++++++++++++
3 files changed, 61 insertions(+)
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 6f0a396d5bf..1c6c01a0571 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1 +1,2 @@
DIST nasm-2.14.02.tar.xz 827620 BLAKE2B deb1f3c806ffbe48eefe4163271c68f02a782f75f21980331cb03e64de20da61c118621536c1c869c1629e558cab45ce98fed8443d29c1126fb4255cd6a36ce4 SHA512 c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81
+DIST nasm-2.15.tar.xz 975180 BLAKE2B 86fe345ddcc1817471e07fe17ba9009afa02fda152301e3d1cedff624cbd6ebb0e016a2fda339bd53f30fb3d60ae19f806d21c9dbe433ebb7d0e9a74d9db1576 SHA512 c88ff62d08aac86c4ce994bb83e80f1644e0433b01c40cebf183281d31bb4c79471f78e3beab6e7cafb28b3e92298aef89d75672444ea5e8d65c3b019e219583
diff --git a/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch b/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch
new file mode 100644
index 00000000000..5c7f6cfafea
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.15-bsd-cp-doc.patch
@@ -0,0 +1,13 @@
+Avoid 'cp -u' as it's not portable.
+
+In this case we can unconditionally copy files.
+
+Reported-by: Michał Górny
+Bug: https://bugs.gentoo.org/655444
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -28,3 +28,3 @@ RM_RF = rm -rf
+ CP_F = cp -f
+-CP_UF = cp -uf
++CP_UF = cp -f
+
diff --git a/dev-lang/nasm/nasm-2.15.ebuild b/dev-lang/nasm/nasm-2.15.ebuild
new file mode 100644
index 00000000000..1451280eeac
--- /dev/null
+++ b/dev-lang/nasm/nasm-2.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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 ~arm64 ~ia64 ~ppc64 ~x86 ~x64-cygwin ~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.15-bsd-cp-doc.patch
+)
+
+src_compile() {
+ default
+ use doc && emake doc
+}
+
+src_install() {
+ default
+ emake DESTDIR="${D}" install_rdf $(usex doc install_doc '')
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nasm/, dev-lang/nasm/files/
@ 2023-10-03 8:23 Matthew Smith
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Smith @ 2023-10-03 8:23 UTC (permalink / raw
To: gentoo-commits
commit: ebf663ea9fba020321c0cbfb4e713a11fa8c0e43
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 3 08:18:24 2023 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Tue Oct 3 08:23:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf663ea
dev-lang/nasm: EAPI-8
- Bump to EAPI-8.
- Suppress implicit function declaration in configure QA notice.
- Apply autoconf fixes from 2.16.02 (not yet released).
Closes: https://bugs.gentoo.org/898306
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../files/nasm-2.16-autoconf-macro-fixes.patch | 241 +++++++++++++++++++++
...{nasm-2.16.01.ebuild => nasm-2.16.01-r1.ebuild} | 23 +-
2 files changed, 262 insertions(+), 2 deletions(-)
diff --git a/dev-lang/nasm/files/nasm-2.16-autoconf-macro-fixes.patch b/dev-lang/nasm/files/nasm-2.16-autoconf-macro-fixes.patch
new file mode 100644
index 000000000000..c2efc5b2e2f6
--- /dev/null
+++ b/dev-lang/nasm/files/nasm-2.16-autoconf-macro-fixes.patch
@@ -0,0 +1,241 @@
+From 5a2d629501d57301fe1d85fe6b2576e318f523d1 Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin" <hpa@zytor.com>
+Date: Sun, 19 Feb 2023 21:26:15 -0800
+Subject: [PATCH] autoconf: a much of macro fixes... not sure how this ever
+ worked?
+
+Exposed a bunch of problems with the autoconf m4 macro
+library. Hopefulyy fix it, and tidy it up in the process.
+
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+--- /dev/null
++++ b/autoconf/m4/pa_add_cppflags.m4
+@@ -0,0 +1,9 @@
++dnl --------------------------------------------------------------------------
++dnl PA_ADD_CPPFLAGS(variable, flag [,actual_flag [,success [,failure]]]])
++dnl
++dnl Attempt to add the given option to xFLAGS, if it doesn't break
++dnl compilation. If the option to be tested is different than the
++dnl option that should actually be added, add the option to be
++dnl actually added as a second argument.
++dnl --------------------------------------------------------------------------
++AC_DEFUN([PA_ADD_CPPFLAGS], [PA_ADD_FLAGS(CPPFLAGS, [$1], [$2], [$3], [$4])])
+--- a/autoconf/m4/pa_add_flags.m4
++++ b/autoconf/m4/pa_add_flags.m4
+@@ -1,23 +1,39 @@
+ dnl --------------------------------------------------------------------------
+-dnl PA_ADD_FLAGS(variable, flag [,actual_flag [,success [,failure]]])
++dnl PA_ADD_FLAGS(flagvar, flags)
+ dnl
+-dnl Attempt to add the given option to CPPFLAGS, if it doesn't break
+-dnl compilation. If the option to be tested is different than the
+-dnl option that should actually be added, add the option to be
+-dnl actually added as a second argument.
++dnl Add [flags] to the variable [flagvar] if and only if it is accepted
++dnl by all languages affected by [flagvar], if those languages have
++dnl been previously seen in the script.
+ dnl --------------------------------------------------------------------------
+ AC_DEFUN([PA_ADD_FLAGS],
+-[AC_MSG_CHECKING([if $CC accepts $2])
+- pa_add_flags__old_flags="$$1"
+- $1="$$1 $2"
+- AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
+- [printf("Hello, World!\n");])],
+- [AC_MSG_RESULT([yes])
+- $1="$pa_add_flags__old_flags ifelse([$3],[],[$2],[$3])"
+- AC_DEFINE(PA_SYM([$1_],[$2]), 1,
+- [Define to 1 if compiled with the `$2' compiler flag])
++[
++ AS_VAR_PUSHDEF([old], [_$0_$1_orig])
++ AS_VAR_PUSHDEF([ok], [_$0_$1_ok])
++ AS_VAR_PUSHDEF([flags], [$1])
++
++ AS_VAR_COPY([old], [flags])
++ AS_VAR_SET([flags], ["$flags $2"])
++ AS_VAR_SET([ok], [yes])
++
++ PA_LANG_FOREACH(PA_FLAGS_LANGLIST($1),
++ [AS_VAR_IF([ok], [yes],
++ [AC_MSG_CHECKING([if $]_AC_CC[ accepts $2])
++ PA_BUILD_IFELSE([],
++ [AC_MSG_RESULT([yes])],
++ [AC_MSG_RESULT([no])
++ AS_VAR_SET([ok], [no])])])
++ ])
++
++ AS_VAR_IF([ok], [yes],
++ [m4_ifnblank([$3],[AS_VAR_SET([flags], ["$old $3"])])
++ m4_foreach_w([_pa_add_flags_flag], [m4_ifblank([$3],[$2],[$3])],
++ [AC_DEFINE(PA_SYM([$1_]_pa_add_flags_flag), 1,
++ [Define to 1 if compiled with the ]_pa_add_flags_flag[ compiler flag])])
+ $4],
+- [AC_MSG_RESULT([no])
+- $1="$pa_add_flags__old_flags"
+- $5])])
++ [AS_VAR_SET([flags], ["$old"])
++ $5])
++
++ AS_VAR_POPDEF([flags])
++ AS_VAR_POPDEF([ok])
++ AS_VAR_POPDEF([old])
++])
+--- /dev/null
++++ b/autoconf/m4/pa_build_ifelse.m4
+@@ -0,0 +1,16 @@
++dnl --------------------------------------------------------------------------
++dnl PA_BUILD_IFELSE(input [,success [,failure]])
++dnl
++dnl Same as AC_LINK_IFELSE for languages where linking is applicable,
++dnl otherwise AC_COMPILE_IFELSE.
++dnl
++dnl If the first argument is empty, use _AC_LANG_IO_PROGRAM.
++dnl --------------------------------------------------------------------------
++m4_defun([_PA_BUILD_IFELSE],
++[m4_case(_AC_LANG,
++ [Erlang], [AC_COMPILE_IFELSE($@)],
++ [AC_LINK_IFELSE($@)])])
++
++AC_DEFUN([PA_BUILD_IFELSE],
++[_PA_BUILD_IFELSE([m4_ifblank([$1],[AC_LANG_SOURCE(_AC_LANG_IO_PROGRAM)],
++ [$1])],[$2],[$3])])
+--- /dev/null
++++ b/autoconf/m4/pa_flags_langlist.m4
+@@ -0,0 +1,19 @@
++dnl --------------------------------------------------------------------------
++dnl PA_FLAGS_LANGLIST(flagvar)
++dnl
++dnl Return a list of languages affected by the variable flagvar.
++dnl If flagvar is unknown, assume it affects the current language.
++dnl --------------------------------------------------------------------------
++AC_DEFUN([PA_FLAGS_LANGLIST],
++[m4_dquote(m4_case([$1],
++ [CPPFLAGS], [[C],[C++],[Objective C],[Objective C++]],
++ [CFLAGS], [[C]],
++ [CXXFLAGS], [[C++]],
++ [FFLAGS], [[Fortran 77]],
++ [FCFLAGS], [[Fortran]],
++ [ERLCFLAGS], [[Erlang]],
++ [OBJCFLAGS], [[Objective C]],
++ [OBJCXXFLAGS], [[Objective C++]],
++ [GOFLAGS], [[Go]],
++ [LDFLAGS], [[C],[C++],[Fortran 77],[Fortran],[Objective C],[Objective C++],[Go]],
++ m4_dquote(_AC_LANG)))])
+--- /dev/null
++++ b/autoconf/m4/pa_lang_foreach.m4
+@@ -0,0 +1,15 @@
++dnl --------------------------------------------------------------------------
++dnl PA_LANG_FOREACH(subset, body)
++dnl
++dnl Expand [body] for each language encountered in the configure script also
++dnl present in [subset], or all if [subset] is empty
++dnl --------------------------------------------------------------------------
++AC_DEFUN([_PA_LANG_DO],dnl
++[AC_LANG([$2])dnl
++$1])
++
++AC_DEFUN([PA_LANG_FOREACH],dnl
++[m4_pushdef([_pa_lang_foreach_current],[_AC_LANG])dnl
++m4_map_args([m4_curry([_PA_LANG_DO],[$2])],m4_unquote(PA_LANG_SEEN_LIST($1)))dnl
++AC_LANG(_pa_lang_foreach_current)dnl
++m4_popdef([_pa_lang_foreach_current])])
+--- /dev/null
++++ b/autoconf/m4/pa_lang_seen_list.m4
+@@ -0,0 +1,20 @@
++dnl --------------------------------------------------------------------------
++dnl PA_LANG_SEEN_LIST(subset)
++dnl
++dnl List of the language lang has been used in the configuration
++dnl script so far, possibly subset by [subset].
++dnl
++dnl This relies on overriding _AC_LANG_SET(from, to),
++dnl the internal implementation of _AC_LANG.
++dnl --------------------------------------------------------------------------
++m4_ifndef([_PA_LANG_SET],
++[m4_rename([_AC_LANG_SET], [_PA_LANG_SET])dnl
++m4_defun([_AC_LANG_SET], [m4_set_add([_PA_LANG_SEEN_SET],[$2])dnl
++_PA_LANG_SET($@)])])
++
++AC_DEFUN([PA_LANG_SEEN_LIST],
++[m4_set_delete([_pa_lang_seen_subset])dnl
++m4_pushdef([_pa_lang_seen_subset_list],m4_ifnblank([$1],[$1],m4_dquote(m4_set_list([_PA_LANG_SEEN_SET]))))dnl
++m4_set_add_all([_pa_lang_seen_subset],_pa_lang_seen_subset_list)dnl
++m4_cdr(m4_set_intersection([_pa_lang_seen_subset],[_PA_LANG_SEEN_SET]))dnl
++m4_popdef([_pa_lang_seen_subset_list])])
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,9 +12,6 @@ dnl start; this is used to generate config/unconfig.h.
+ AH_BOTTOM([
+ /* Begin unconfig.h */])
+
+-dnl Save initial CFLAGS, to see if -g -O2 came from configure or not
+-pa_init_cflags="$CFLAGS"
+-
+ dnl This prevents us from running Wine and thinking we are not
+ dnl cross-compiling when in fact we are; running Wine here is at
+ dnl the best very slow and doesn't buy us a single thing at all.
+@@ -27,35 +24,29 @@ AC_CANONICAL_HOST
+ dnl Enable any available C extensions
+ AC_PROG_CC
+ AC_USE_SYSTEM_EXTENSIONS
+-AC_SYS_LARGEFILE
+-PA_ADD_CFLAGS([-std=c17], [], [],
+-[PA_ADD_CFLAGS([-std=c11], [], [],
+- [PA_ADD_CFLAGS([-std=c99])])])
+-
+-dnl If the user did not specify a CFLAGS default, change default
+-dnl to -O0 for debugging
+-PA_ARG_DISABLED([optimization],
+- [compile without optimization (-O0) to help debugging],
+- [pa_no_optimize=true])
++PA_ADD_CPPFLAGS([-std=c17], [], [],
++[PA_ADD_CPPFLAGS([-std=c11], [], [],
++ [PA_ADD_CPPFLAGS([-std=c99])])])
+
+-dnl Other programs
+-pa_no_optimize=false
+-
+-dnl Compile and link with dwarf debug
++dnl Compile and link with gdb debug extensions
+ PA_ARG_ENABLED([gdb],
+- [disable optimization and compile with extra debug information for GDB debugger],
+- [PA_ADD_CFLAGS([-ggdb3])
+- pa_no_optimize=true])
++ [compile with extra debug information for GDB debugger],
++ [PA_ADD_CFLAGS([-ggdb3])])
+
+-AS_IF([$pa_no_optimize],
+- [PA_ADD_CFLAGS([-O0])
+- PA_ADD_CFLAGS([-fno-omit-frame-pointer])])
++dnl Disable optimization
++PA_ARG_DISABLED([optimization],
++ [compile without optimization (-O0) to help debugging],
++ [PA_ADD_CFLAGS([-O0])
++ PA_ADD_CFLAGS([-fno-omit-frame-pointer])])
+
+ dnl Profiling
+ PA_ARG_ENABLED([profiling],
+ [compile with profiling (-pg option)],
+ [PA_ADD_CFLAGS([-pg])])
+
++dnl Large files
++AC_SYS_LARGEFILE
++
+ dnl Abort on panic
+ PA_ARG_ENABLED([panic-abort],
+ [call abort() on panic to trap in the debugger],
+@@ -104,10 +95,10 @@ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ AC_PROG_MKDIR_P
+
+-AC_CHECK_PROGS(NROFF, nroff, false)
+-AC_CHECK_PROGS(ASCIIDOC, asciidoc, false)
+-AC_CHECK_PROGS(XMLTO, xmlto, false)
+-AC_CHECK_PROGS(XZ, xz, false)
++AC_CHECK_PROGS([NROFF], nroff, false)
++AC_CHECK_PROGS([ASCIIDOC], asciidoc, false)
++AC_CHECK_PROGS([XMLTO], xmlto, false)
++AC_CHECK_PROGS([XZ], xz, false)
+
+ dnl Check for progs needed for manpage generation
+ MANPAGES=manpages
diff --git a/dev-lang/nasm/nasm-2.16.01.ebuild b/dev-lang/nasm/nasm-2.16.01-r1.ebuild
similarity index 77%
rename from dev-lang/nasm/nasm-2.16.01.ebuild
rename to dev-lang/nasm/nasm-2.16.01-r1.ebuild
index 0516affa1974..499e7181c397 100644
--- a/dev-lang/nasm/nasm-2.16.01.ebuild
+++ b/dev-lang/nasm/nasm-2.16.01-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+inherit autotools
DESCRIPTION="groovy little assembler"
HOMEPAGE="https://www.nasm.us/"
@@ -13,6 +15,20 @@ SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
+QA_CONFIG_IMPL_DECL_SKIP=(
+ _BitScanReverse
+ _BitScanReverse64
+ __cpu_to_le16
+ __cpu_to_le32
+ __cpu_to_le64
+ _byteswap_uint64
+ _byteswap_ulong
+ _byteswap_ushort
+ cpu_to_le16
+ cpu_to_le32
+ cpu_to_le64
+)
+
# [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.
@@ -30,6 +46,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
+ "${FILESDIR}"/${PN}-2.16-autoconf-macro-fixes.patch
)
src_prepare() {
@@ -40,6 +57,8 @@ src_prepare() {
# were renamed. Currently depend on media-fonts/source-sans:3 which works
# with this sed.
sed -i 's/SourceSansPro/SourceSans3/g' doc/psfonts.ph || die
+
+ AT_M4DIR="${S}/autoconf/m4" eautoreconf
}
src_compile() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/nasm/, dev-lang/nasm/files/
@ 2024-11-04 0:31 Andreas K. Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Hüttel @ 2024-11-04 0:31 UTC (permalink / raw
To: gentoo-commits
commit: adce089682ed34d831d5fa693e22d6b857719df6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 4 00:24:16 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 00:31:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adce0896
dev-lang/nasm: drop 2.16.01-r1, 2.16.02
Bug: https://bugs.gentoo.org/916478
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
dev-lang/nasm/Manifest | 2 -
.../files/nasm-2.16-autoconf-macro-fixes.patch | 241 ---------------------
dev-lang/nasm/files/nasm-2.16.02-unconfig.patch | 11 -
dev-lang/nasm/nasm-2.16.01-r1.ebuild | 72 ------
dev-lang/nasm/nasm-2.16.02.ebuild | 86 --------
5 files changed, 412 deletions(-)
diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 3c759667d311..0f491497c9ce 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1,3 +1 @@
-DIST nasm-2.16.01.tar.xz 1017732 BLAKE2B 0f7e96648e3db6fa4a8e10a89885f61cab7d79af25adbcc9d4706b3af61206c3cae024b7f873d636f5c1b2cb34ce5e7fbecc16af9b59086e9a1f49fb37c59670 SHA512 51fccb5639ce019d9c423c0f279750ffbd74c64cd41dd3b185d1aa1a1aaed79c5d3cd8d4bebbc13ee249a375ed27457ea2abde1a4dbb24d354598fffd1254833
-DIST nasm-2.16.02.tar.xz 1044824 BLAKE2B daa3585e9aef3c388e3b577a52453b31aaa7f13942e621c21bbe6ec744ff30bf2692e853dda193b30006989cb10e40dcc1cf0107176e31fd5ee096baad28c7a1 SHA512 9ccafb4cd9064fb21f6551309d35ba7461de8da138b1239d76c2ea0c070a1a767f1019d5d705088375d625cfb73eebbfd9dfa3588107793b95354d89dcfd22c3
DIST nasm-2.16.03.tar.xz 1032388 BLAKE2B 742cbf330341fde9f778d8ca13e8c06199f48796d47028ac973d39e3d9e434450cdfebe89f6ab248d372bdaeb0c88a25eb7153a39b66fc05e770523d4c9e11e9 SHA512 0c706e41a9c33e1ac3bad5056e8bf8cbcd51785b551a6e34ce7d0d723df8eaab8603a033e89b3dcda1004b558f9e9ef3196691500f10d8201bf47a323a516f84
diff --git a/dev-lang/nasm/files/nasm-2.16-autoconf-macro-fixes.patch b/dev-lang/nasm/files/nasm-2.16-autoconf-macro-fixes.patch
deleted file mode 100644
index c2efc5b2e2f6..000000000000
--- a/dev-lang/nasm/files/nasm-2.16-autoconf-macro-fixes.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From 5a2d629501d57301fe1d85fe6b2576e318f523d1 Mon Sep 17 00:00:00 2001
-From: "H. Peter Anvin" <hpa@zytor.com>
-Date: Sun, 19 Feb 2023 21:26:15 -0800
-Subject: [PATCH] autoconf: a much of macro fixes... not sure how this ever
- worked?
-
-Exposed a bunch of problems with the autoconf m4 macro
-library. Hopefulyy fix it, and tidy it up in the process.
-
-Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---- /dev/null
-+++ b/autoconf/m4/pa_add_cppflags.m4
-@@ -0,0 +1,9 @@
-+dnl --------------------------------------------------------------------------
-+dnl PA_ADD_CPPFLAGS(variable, flag [,actual_flag [,success [,failure]]]])
-+dnl
-+dnl Attempt to add the given option to xFLAGS, if it doesn't break
-+dnl compilation. If the option to be tested is different than the
-+dnl option that should actually be added, add the option to be
-+dnl actually added as a second argument.
-+dnl --------------------------------------------------------------------------
-+AC_DEFUN([PA_ADD_CPPFLAGS], [PA_ADD_FLAGS(CPPFLAGS, [$1], [$2], [$3], [$4])])
---- a/autoconf/m4/pa_add_flags.m4
-+++ b/autoconf/m4/pa_add_flags.m4
-@@ -1,23 +1,39 @@
- dnl --------------------------------------------------------------------------
--dnl PA_ADD_FLAGS(variable, flag [,actual_flag [,success [,failure]]])
-+dnl PA_ADD_FLAGS(flagvar, flags)
- dnl
--dnl Attempt to add the given option to CPPFLAGS, if it doesn't break
--dnl compilation. If the option to be tested is different than the
--dnl option that should actually be added, add the option to be
--dnl actually added as a second argument.
-+dnl Add [flags] to the variable [flagvar] if and only if it is accepted
-+dnl by all languages affected by [flagvar], if those languages have
-+dnl been previously seen in the script.
- dnl --------------------------------------------------------------------------
- AC_DEFUN([PA_ADD_FLAGS],
--[AC_MSG_CHECKING([if $CC accepts $2])
-- pa_add_flags__old_flags="$$1"
-- $1="$$1 $2"
-- AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
-- [printf("Hello, World!\n");])],
-- [AC_MSG_RESULT([yes])
-- $1="$pa_add_flags__old_flags ifelse([$3],[],[$2],[$3])"
-- AC_DEFINE(PA_SYM([$1_],[$2]), 1,
-- [Define to 1 if compiled with the `$2' compiler flag])
-+[
-+ AS_VAR_PUSHDEF([old], [_$0_$1_orig])
-+ AS_VAR_PUSHDEF([ok], [_$0_$1_ok])
-+ AS_VAR_PUSHDEF([flags], [$1])
-+
-+ AS_VAR_COPY([old], [flags])
-+ AS_VAR_SET([flags], ["$flags $2"])
-+ AS_VAR_SET([ok], [yes])
-+
-+ PA_LANG_FOREACH(PA_FLAGS_LANGLIST($1),
-+ [AS_VAR_IF([ok], [yes],
-+ [AC_MSG_CHECKING([if $]_AC_CC[ accepts $2])
-+ PA_BUILD_IFELSE([],
-+ [AC_MSG_RESULT([yes])],
-+ [AC_MSG_RESULT([no])
-+ AS_VAR_SET([ok], [no])])])
-+ ])
-+
-+ AS_VAR_IF([ok], [yes],
-+ [m4_ifnblank([$3],[AS_VAR_SET([flags], ["$old $3"])])
-+ m4_foreach_w([_pa_add_flags_flag], [m4_ifblank([$3],[$2],[$3])],
-+ [AC_DEFINE(PA_SYM([$1_]_pa_add_flags_flag), 1,
-+ [Define to 1 if compiled with the ]_pa_add_flags_flag[ compiler flag])])
- $4],
-- [AC_MSG_RESULT([no])
-- $1="$pa_add_flags__old_flags"
-- $5])])
-+ [AS_VAR_SET([flags], ["$old"])
-+ $5])
-+
-+ AS_VAR_POPDEF([flags])
-+ AS_VAR_POPDEF([ok])
-+ AS_VAR_POPDEF([old])
-+])
---- /dev/null
-+++ b/autoconf/m4/pa_build_ifelse.m4
-@@ -0,0 +1,16 @@
-+dnl --------------------------------------------------------------------------
-+dnl PA_BUILD_IFELSE(input [,success [,failure]])
-+dnl
-+dnl Same as AC_LINK_IFELSE for languages where linking is applicable,
-+dnl otherwise AC_COMPILE_IFELSE.
-+dnl
-+dnl If the first argument is empty, use _AC_LANG_IO_PROGRAM.
-+dnl --------------------------------------------------------------------------
-+m4_defun([_PA_BUILD_IFELSE],
-+[m4_case(_AC_LANG,
-+ [Erlang], [AC_COMPILE_IFELSE($@)],
-+ [AC_LINK_IFELSE($@)])])
-+
-+AC_DEFUN([PA_BUILD_IFELSE],
-+[_PA_BUILD_IFELSE([m4_ifblank([$1],[AC_LANG_SOURCE(_AC_LANG_IO_PROGRAM)],
-+ [$1])],[$2],[$3])])
---- /dev/null
-+++ b/autoconf/m4/pa_flags_langlist.m4
-@@ -0,0 +1,19 @@
-+dnl --------------------------------------------------------------------------
-+dnl PA_FLAGS_LANGLIST(flagvar)
-+dnl
-+dnl Return a list of languages affected by the variable flagvar.
-+dnl If flagvar is unknown, assume it affects the current language.
-+dnl --------------------------------------------------------------------------
-+AC_DEFUN([PA_FLAGS_LANGLIST],
-+[m4_dquote(m4_case([$1],
-+ [CPPFLAGS], [[C],[C++],[Objective C],[Objective C++]],
-+ [CFLAGS], [[C]],
-+ [CXXFLAGS], [[C++]],
-+ [FFLAGS], [[Fortran 77]],
-+ [FCFLAGS], [[Fortran]],
-+ [ERLCFLAGS], [[Erlang]],
-+ [OBJCFLAGS], [[Objective C]],
-+ [OBJCXXFLAGS], [[Objective C++]],
-+ [GOFLAGS], [[Go]],
-+ [LDFLAGS], [[C],[C++],[Fortran 77],[Fortran],[Objective C],[Objective C++],[Go]],
-+ m4_dquote(_AC_LANG)))])
---- /dev/null
-+++ b/autoconf/m4/pa_lang_foreach.m4
-@@ -0,0 +1,15 @@
-+dnl --------------------------------------------------------------------------
-+dnl PA_LANG_FOREACH(subset, body)
-+dnl
-+dnl Expand [body] for each language encountered in the configure script also
-+dnl present in [subset], or all if [subset] is empty
-+dnl --------------------------------------------------------------------------
-+AC_DEFUN([_PA_LANG_DO],dnl
-+[AC_LANG([$2])dnl
-+$1])
-+
-+AC_DEFUN([PA_LANG_FOREACH],dnl
-+[m4_pushdef([_pa_lang_foreach_current],[_AC_LANG])dnl
-+m4_map_args([m4_curry([_PA_LANG_DO],[$2])],m4_unquote(PA_LANG_SEEN_LIST($1)))dnl
-+AC_LANG(_pa_lang_foreach_current)dnl
-+m4_popdef([_pa_lang_foreach_current])])
---- /dev/null
-+++ b/autoconf/m4/pa_lang_seen_list.m4
-@@ -0,0 +1,20 @@
-+dnl --------------------------------------------------------------------------
-+dnl PA_LANG_SEEN_LIST(subset)
-+dnl
-+dnl List of the language lang has been used in the configuration
-+dnl script so far, possibly subset by [subset].
-+dnl
-+dnl This relies on overriding _AC_LANG_SET(from, to),
-+dnl the internal implementation of _AC_LANG.
-+dnl --------------------------------------------------------------------------
-+m4_ifndef([_PA_LANG_SET],
-+[m4_rename([_AC_LANG_SET], [_PA_LANG_SET])dnl
-+m4_defun([_AC_LANG_SET], [m4_set_add([_PA_LANG_SEEN_SET],[$2])dnl
-+_PA_LANG_SET($@)])])
-+
-+AC_DEFUN([PA_LANG_SEEN_LIST],
-+[m4_set_delete([_pa_lang_seen_subset])dnl
-+m4_pushdef([_pa_lang_seen_subset_list],m4_ifnblank([$1],[$1],m4_dquote(m4_set_list([_PA_LANG_SEEN_SET]))))dnl
-+m4_set_add_all([_pa_lang_seen_subset],_pa_lang_seen_subset_list)dnl
-+m4_cdr(m4_set_intersection([_pa_lang_seen_subset],[_PA_LANG_SEEN_SET]))dnl
-+m4_popdef([_pa_lang_seen_subset_list])])
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,9 +12,6 @@ dnl start; this is used to generate config/unconfig.h.
- AH_BOTTOM([
- /* Begin unconfig.h */])
-
--dnl Save initial CFLAGS, to see if -g -O2 came from configure or not
--pa_init_cflags="$CFLAGS"
--
- dnl This prevents us from running Wine and thinking we are not
- dnl cross-compiling when in fact we are; running Wine here is at
- dnl the best very slow and doesn't buy us a single thing at all.
-@@ -27,35 +24,29 @@ AC_CANONICAL_HOST
- dnl Enable any available C extensions
- AC_PROG_CC
- AC_USE_SYSTEM_EXTENSIONS
--AC_SYS_LARGEFILE
--PA_ADD_CFLAGS([-std=c17], [], [],
--[PA_ADD_CFLAGS([-std=c11], [], [],
-- [PA_ADD_CFLAGS([-std=c99])])])
--
--dnl If the user did not specify a CFLAGS default, change default
--dnl to -O0 for debugging
--PA_ARG_DISABLED([optimization],
-- [compile without optimization (-O0) to help debugging],
-- [pa_no_optimize=true])
-+PA_ADD_CPPFLAGS([-std=c17], [], [],
-+[PA_ADD_CPPFLAGS([-std=c11], [], [],
-+ [PA_ADD_CPPFLAGS([-std=c99])])])
-
--dnl Other programs
--pa_no_optimize=false
--
--dnl Compile and link with dwarf debug
-+dnl Compile and link with gdb debug extensions
- PA_ARG_ENABLED([gdb],
-- [disable optimization and compile with extra debug information for GDB debugger],
-- [PA_ADD_CFLAGS([-ggdb3])
-- pa_no_optimize=true])
-+ [compile with extra debug information for GDB debugger],
-+ [PA_ADD_CFLAGS([-ggdb3])])
-
--AS_IF([$pa_no_optimize],
-- [PA_ADD_CFLAGS([-O0])
-- PA_ADD_CFLAGS([-fno-omit-frame-pointer])])
-+dnl Disable optimization
-+PA_ARG_DISABLED([optimization],
-+ [compile without optimization (-O0) to help debugging],
-+ [PA_ADD_CFLAGS([-O0])
-+ PA_ADD_CFLAGS([-fno-omit-frame-pointer])])
-
- dnl Profiling
- PA_ARG_ENABLED([profiling],
- [compile with profiling (-pg option)],
- [PA_ADD_CFLAGS([-pg])])
-
-+dnl Large files
-+AC_SYS_LARGEFILE
-+
- dnl Abort on panic
- PA_ARG_ENABLED([panic-abort],
- [call abort() on panic to trap in the debugger],
-@@ -104,10 +95,10 @@ AC_PROG_MAKE_SET
- AC_PROG_INSTALL
- AC_PROG_MKDIR_P
-
--AC_CHECK_PROGS(NROFF, nroff, false)
--AC_CHECK_PROGS(ASCIIDOC, asciidoc, false)
--AC_CHECK_PROGS(XMLTO, xmlto, false)
--AC_CHECK_PROGS(XZ, xz, false)
-+AC_CHECK_PROGS([NROFF], nroff, false)
-+AC_CHECK_PROGS([ASCIIDOC], asciidoc, false)
-+AC_CHECK_PROGS([XMLTO], xmlto, false)
-+AC_CHECK_PROGS([XZ], xz, false)
-
- dnl Check for progs needed for manpage generation
- MANPAGES=manpages
diff --git a/dev-lang/nasm/files/nasm-2.16.02-unconfig.patch b/dev-lang/nasm/files/nasm-2.16.02-unconfig.patch
deleted file mode 100644
index 77478b7e68cc..000000000000
--- a/dev-lang/nasm/files/nasm-2.16.02-unconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in 2024-04-05 07:51:48.394437050 -0000
-+++ b/Makefile.in 2024-04-05 07:52:38.731388961 -0000
-@@ -214,7 +214,7 @@
- INSDEP = x86/insns.dat x86/insns.pl x86/insns-iflags.ph x86/iflags.ph
-
- config/unconfig.h: config/config.h.in
-- $(RUNPERL) $(tools)/unconfig.pl \
-+ $(RUNPERL) $(top_srcdir)/autoconf/unconfig.pl \
- '$(srcdir)' config/config.h.in config/unconfig.h
-
- x86/iflag.c: $(INSDEP)
diff --git a/dev-lang/nasm/nasm-2.16.01-r1.ebuild b/dev-lang/nasm/nasm-2.16.01-r1.ebuild
deleted file mode 100644
index aaa1921d750a..000000000000
--- a/dev-lang/nasm/nasm-2.16.01-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="groovy little assembler"
-HOMEPAGE="https://www.nasm.us/"
-SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
-S="${WORKDIR}"/${P/_}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
- _BitScanReverse
- _BitScanReverse64
- __cpu_to_le16
- __cpu_to_le32
- __cpu_to_le64
- _byteswap_uint64
- _byteswap_ulong
- _byteswap_ushort
- cpu_to_le16
- cpu_to_le32
- cpu_to_le64
-)
-
-# [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-code-pro
- media-fonts/source-sans:3
- virtual/perl-File-Spec
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
- "${FILESDIR}"/${PN}-2.16-autoconf-macro-fixes.patch
-)
-
-src_prepare() {
- default
-
- # https://bugs.gentoo.org/870214
- # During the split of media-fonts/source-pro, the source-sans files
- # were renamed. Currently depend on media-fonts/source-sans:3 which works
- # with this sed.
- sed -i 's/SourceSansPro/SourceSans3/g' doc/psfonts.ph || die
-
- AT_M4DIR="${S}/autoconf/m4" eautoreconf
-}
-
-src_compile() {
- default
- use doc && emake doc
-}
-
-src_install() {
- default
- emake DESTDIR="${D}" install $(usex doc install_doc '')
-}
diff --git a/dev-lang/nasm/nasm-2.16.02.ebuild b/dev-lang/nasm/nasm-2.16.02.ebuild
deleted file mode 100644
index 784a7a38383f..000000000000
--- a/dev-lang/nasm/nasm-2.16.02.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="groovy little assembler"
-HOMEPAGE="https://www.nasm.us/"
-SRC_URI="https://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
-S="${WORKDIR}"/${P/_}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
- # Windows.
- _BitScanReverse
- _BitScanReverse64
-
- # Linux headers that are not included.
- __cpu_to_le16
- __cpu_to_le32
- __cpu_to_le64
- _byteswap_uint64
- _byteswap_ulong
- _byteswap_ushort
- cpu_to_le16
- cpu_to_le32
- cpu_to_le64
-
- # __typeof as gnu extensions are not enabled
- typeof
-
- # musl doesn't define __bswap_N in endian.h (it's named _bswapN
- # instead). could be fixed to call this instead, or to include
- # musl's byteswap.h instead, but it is much easier to fall back on
- # __builtin_bswapN. Bug #928848
- __bswap_16
- __bswap_32
- __bswap_64
-)
-
-# [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-code-pro
- media-fonts/source-sans:3
- virtual/perl-File-Spec
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.15-bsd-cp-doc.patch
- "${FILESDIR}"/${PN}-2.16.02-unconfig.patch
-)
-
-src_prepare() {
- default
-
- # https://bugs.gentoo.org/870214
- # During the split of media-fonts/source-pro, the source-sans files
- # were renamed. Currently depend on media-fonts/source-sans:3 which works
- # with this sed.
- sed -i 's/SourceSansPro/SourceSans3/g' doc/psfonts.ph || die
-
- AT_M4DIR="${S}/autoconf/m4" eautoreconf
-}
-
-src_compile() {
- default
- use doc && emake doc
-}
-
-src_install() {
- default
- emake DESTDIR="${D}" install $(usex doc install_doc '')
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-04 0:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-28 16:15 [gentoo-commits] repo/gentoo:master commit in: dev-lang/nasm/, dev-lang/nasm/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2024-11-04 0:31 Andreas K. Hüttel
2023-10-03 8:23 Matthew Smith
2018-12-08 18:54 Sergei Trofimovich
2017-07-02 3:05 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox