* [gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/, app-misc/fdutils/files/
@ 2017-08-17 14:06 Amy Liffey
0 siblings, 0 replies; 3+ messages in thread
From: Amy Liffey @ 2017-08-17 14:06 UTC (permalink / raw
To: gentoo-commits
commit: e119246f39378df15dfe1ddda680080bdc9b38a4
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 14:01:41 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 14:05:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e119246f
app-misc/fdutils: rm old deprecated eapi
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-misc/fdutils/Manifest | 1 -
app-misc/fdutils/fdutils-5.5-r2.ebuild | 41 ------
.../fdutils/files/fdutils-5.5-destdirfix.patch | 140 ---------------------
3 files changed, 182 deletions(-)
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 7c083712c10..d192b05c5d4 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,5 +1,4 @@
DIST fdutils-5.4-20020222.diff.gz 25310 SHA256 259c340a5956272e60385d0b8ae0a04b3d2ae0fc395114672536cba5f50bf903 SHA512 069583e796f86266e486ad65009d6a8163fc56b59f957f34ab144cc25188b868c950a48e2fd25fc876cd5b1fa3faa40bdc4c16e4690fe3a2a47f933f85e31094 WHIRLPOOL 9b679a1a0b7254a1d72de083c3ae3fa9c329234c6da6138ad08649cde8fbff002e31ba8f0d4de504c3a98404a88ab23a3dc76a60b51599ee18af786f157e2d12
DIST fdutils-5.4.tar.gz 190535 SHA256 20ebb4fa9ec74e669eb0377819fafbf177325e930906032649aa8344bb34b9e9 SHA512 3c2dde9d2e14f771f6916851827df5b2dde62e3522b6ceb411bf0772800a4d8ed4721d99ad170b81de0cc8dba41a60817232993f3d69eb07141e1929ac626570 WHIRLPOOL 20626366bc1ad4334184de97c8ef43d50a00496be80f298a59eeb1144f493750cea61a39cc43ff8d251794854ec0a635141bc39d43cba9fad36c411bd0710da2
-DIST fdutils-5.5.tar.gz 222801 SHA256 87d5bbe8094558463acc5902664c58afd794322b0ea3ab3c2ed7b362c583a48a SHA512 c9eab0b8931bbd11fcacfeff54c87059844b068595725abb00c7c605cba0bdc7c9abcd31d0a0186786306a9136eac2ec3bad43842f0383acdb162ccbb39a73b8 WHIRLPOOL 622ded0b8f56257f42fdb7ab7ce648a3d813882c2b05ab30cc36c1b447b66e8c51757ce972b43ffd65d7929be7b7aed72ff3fe235c8fa47a263739ae1daace14
DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 SHA256 51fae03acb4f087b09c076dc3ec4e7b31362f1e1a9fa7b2b17d6dade1cd512fb SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149 WHIRLPOOL f34a8d5d98a5b89544270dad4c3198881062aef7bec99e2dbfc186bfeab2e24f5ac741b487fac8136d7bddce907527645116d26d21f5f1af9e6d4f6c581196e8
DIST fdutils_5.5-20060227.orig.tar.gz 222915 SHA256 a867b381adc3596ca9a0c9139773bef18a38ceb5fa0e7401af46813c3a4b8d58 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd WHIRLPOOL 4baa17276258669d950a0b3199db23521ebcd63ebe069f9ad94ec1903dd62e142314ad411c6d40a7323f5cc4869f3fab147ca3eb930f4ae0c7dcaaea3362c442
diff --git a/app-misc/fdutils/fdutils-5.5-r2.ebuild b/app-misc/fdutils/fdutils-5.5-r2.ebuild
deleted file mode 100644
index 69e2df6f677..00000000000
--- a/app-misc/fdutils/fdutils-5.5-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
-HOMEPAGE="http://fdutils.linux.lu/"
-SRC_URI="http://fdutils.linux.lu/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc"
-
-RDEPEND=">=sys-fs/mtools-3"
-
-DEPEND="${RDEPEND}
- doc? ( virtual/texi2dvi )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # the man 4 fd manpage is better in the man-pages package, so stop it
- # from installing
- epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
- epatch "${FILESDIR}/${P}-destdirfix.patch"
- sed -i -e '/\$(INSTALL) -c/s/ -s / /' src/Makefile.in || die "Failed to sed upstream src/Makefile.in to prevent premature strip"
-}
-
-src_compile() {
- econf --enable-fdmount-floppy-only || die
-
- # parallel make unsafe (bug#315577)
- emake -j1 $(use doc || echo compile) || die "emake failed"
-}
-
-src_install() {
- dodoc Changelog
- use doc && dodir /usr/share/info/
- dodir /etc
- emake -j1 DESTDIR="${D}" install || die
-}
diff --git a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
deleted file mode 100644
index 47d1918b1f4..00000000000
--- a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- fdutils-5.5/doc/Makefile.in.orig 2005-07-16 19:54:56.000000000 +1000
-+++ fdutils-5.5/doc/Makefile.in 2005-07-16 20:00:42.000000000 +1000
-@@ -79,68 +79,68 @@
-
- # Don't cd, to avoid breaking install-sh references.
- install-info: info
-- $(top_srcdir)/mkinstalldirs $(infodir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
- if test -f fdutils.info; then \
- for i in fdutils.info*; do \
-- $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
- done; \
- else \
- for i in $(srcdir)/fdutils.info*; do \
-- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
- done; \
- fi; \
- if [ -n "$(INSTALL_INFO)" ] ; then \
- if [ -f $(infodir)/dir.info ] ; then \
-- $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir.info; \
-+ $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \
- fi; \
- if [ -f $(infodir)/dir ] ; then \
-- $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir; \
-+ $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \
- fi; \
- fi
-
-
-
- install-man:
-- $(top_srcdir)/mkinstalldirs $(mandir1)
-- $(top_srcdir)/mkinstalldirs $(mandir4)
-- $(top_srcdir)/mkinstalldirs $(mandir8)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir1)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir4)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir8)
- for i in $(MANPAGES1); do \
- install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-- $(srcdir)/$$i $(mandir1)/$$i; \
-+ $(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \
- done
-
- for i in $(MANPAGES4); do \
- install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-- $(srcdir)/$$i $(mandir4)/$$i; \
-+ $(srcdir)/$$i $(DESTDIR)$(mandir4)/$$i; \
- done
-
- # for i in $(MANPAGES8); do \
- # install -c -m $(MANPERM) -o $(UID) -g $(GID) \
--# $(srcdir)/$$i $(mandir8)/$$i; \
-+# $(srcdir)/$$i $(DESTDIR)$(mandir8)/$$i; \
- # done
-
-- ( cd $(mandir1); \
-- ln -sf fdmount.1 $(mandir1)/fdumount.1; \
-- ln -sf fdmount.1 $(mandir1)/fdlist.1; \
-- ln -sf fdmount.1 $(mandir1)/fdmountd.1; \
-- ln -sf xdfcopy.1 $(mandir1)/xdfformat.1 \
-+ ( cd $(DESTDIR)$(mandir1); \
-+ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdumount.1; \
-+ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdlist.1; \
-+ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdmountd.1; \
-+ ln -sf xdfcopy.1 $(DESTDIR)$(mandir1)/xdfformat.1 \
- )
-
- install-zman:
- for i in $(MANPAGES1); do \
- gzip < $(srcdir)/$$i >_; \
- install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-- _ $(mandir1)/$$i.gz; \
-+ _ $(DESTDIR)$(mandir1)/$$i.gz; \
- done
- for i in $(MANPAGES4); do \
- gzip < $(srcdir)/$$i >_; \
- install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-- _ $(mandir4)/$$i.gz; \
-+ _ $(DESTDIR)$(mandir4)/$$i.gz; \
- done
- for i in $(MANPAGES8); do \
- gzip < $(srcdir)/$$i >_; \
- install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-- _ $(mandir8)/$$i.gz; \
-+ _ $(DESTDIR)$(mandir8)/$$i.gz; \
- done
- rm _
-
---- fdutils-5.5/src/Makefile.in.orig 2005-07-16 19:51:09.000000000 +1000
-+++ fdutils-5.5/src/Makefile.in 2005-07-16 19:54:39.000000000 +1000
-@@ -116,27 +116,27 @@
-
-
- install-conf:
-- $(top_srcdir)/mkinstalldirs $(syconfdir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(syconfdir)
- if [ ! -f $(sysconfdir)/mediaprm ] ; then \
-- cp $(srcdir)/mediaprm $(sysconfdir) ; \
-+ cp $(srcdir)/mediaprm $(DESTDIR)$(sysconfdir) ; \
- fi
-
- install-bin: all
-- $(top_srcdir)/mkinstalldirs $(bindir)
-- $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(bindir)
-- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(bindir)
-- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)
-- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)/fdumount
-- ( cd $(bindir); \
-- ln -sf xdfcopy $(bindir)/xdfformat; \
-- ln -sf fdmount $(bindir)/fdumount; \
-- ln -sf fdmount $(bindir)/fdlist; \
-- ln -sf fdmount $(bindir)/fdmountd )
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)
-+ $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)/fdumount
-+ ( cd $(DESTDIR)$(bindir); \
-+ ln -sf xdfcopy xdfformat; \
-+ ln -sf fdmount fdumount; \
-+ ln -sf fdmount fdlist; \
-+ ln -sf fdmount fdmountd )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/, app-misc/fdutils/files/
@ 2019-03-17 22:37 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2019-03-17 22:37 UTC (permalink / raw
To: gentoo-commits
commit: f968770c9455c55d321ce58b5c850c4491ed9eca
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 22:35:36 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 22:37:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f968770c
app-misc/fdutils: fix parallel compile & add 20081027 patch
Fix parallel compile .a target, and add upstream's 20081027 patch that
was missed otherwise, as well as a compile-fix for the 20081027 patch.
Add myself as maintainer, because I've used this in the past, and used
to be one of the kernel-misc maintainers.
Fixes: https://bugs.gentoo.org/315577
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
app-misc/fdutils/Manifest | 2 +
app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild | 59 ++++++++++++++++++++++
.../files/fdutils-5.5-superformat-snprintf.patch | 16 ++++++
.../files/fdutils-5.5.20060227-r1-parallel.patch | 18 +++++++
app-misc/fdutils/metadata.xml | 5 +-
5 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index aaeb31b898f..94c7a927211 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,2 +1,4 @@
+DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B a6d9bf332a777c6c09c85ea85adfaf02422ed2e459d3cb5248c5f6c122e11d39c1a426288d8b611f61ee5ed33ceb5695644f6fbf5421e7a0b1b9937c6a3c26f3 SHA512 979ad8116a5e0c82584a534095e60689d3920d16f0685a184619012d4146f89d6dce063d896668242bf10a6372579ad16ee3e2093e386ff430f265a23458750d
DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
+DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252 SHA512 a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
new file mode 100644
index 00000000000..d234389a9e1
--- /dev/null
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${PN}_5.5-20060227
+
+DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
+HOMEPAGE="https://fdutils.linux.lu"
+SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
+ mirror://debian/pool/main/f/${PN}/${MY_P}-8.debian.tar.xz
+ https://dev.gentoo.org/~robbat2/distfiles/fdutils-5.5-20060227_20081027.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND=">=sys-fs/mtools-4"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ virtual/os-headers
+ doc? ( virtual/texi2dvi )"
+
+S=${WORKDIR}/${PN}-5.5-20060227
+
+src_prepare() {
+ local d="${WORKDIR}"/debian/patches
+ EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
+ sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
+ # The build sets up config.h and uses some symbols, but forgots to
+ # actually include it in most places.
+ sed -i '1i#include "../config.h"' src/*.c || die #580060
+ epatch "${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch || die # 315577
+ epatch "${DISTDIR}"/fdutils-5.5-20060227_20081027.diff.gz || die # upstream did make a patch-based release after 20060227!
+ epatch "${FILESDIR}"/fdutils-5.5-superformat-snprintf.patch || die # but it had a bug that strict GCC catches
+}
+
+src_configure() {
+ econf --enable-fdmount-floppy-only
+}
+
+src_compile() {
+ emake $(use doc || echo compile)
+}
+
+src_install() {
+ dodir /etc
+ use doc && dodir /usr/share/info
+
+ emake DESTDIR="${D}" install
+
+ # The copy in sys-apps/man-pages is more recent
+ rm -f "${ED}"/usr/share/man/man4/fd.4 || die
+
+ # Rename to match binary
+ mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
+}
diff --git a/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch b/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
new file mode 100644
index 00000000000..49753478e5e
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
@@ -0,0 +1,16 @@
+Fix of snprintf bug in upstream's 20081027 diff.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*.orig' --exclude '*~' fdutils-5.5-20060227.orig/src/superformat.c fdutils-5.5-20060227/src/superformat.c
+--- fdutils-5.5-20060227.orig/src/superformat.c 2019-03-17 14:46:44.051851597 -0700
++++ fdutils-5.5-20060227/src/superformat.c 2019-03-17 14:48:34.550873108 -0700
+@@ -1140,7 +1140,7 @@
+ if (verbosity >= 5)
+ printf("calling mformat\n");
+ if (use_2m)
+- snprintf(twom_buffer, 5, "-2 %2d", fd0.dsect);
++ snprintf(twom_buffer, 6, "-2 %2d", fd0.dsect);
+ else
+ twom_buffer[0]='\0';
+ snprintf(command_buffer, 79,
diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-r1-parallel.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-r1-parallel.patch
new file mode 100644
index 00000000000..52c0a1357a5
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5.20060227-r1-parallel.patch
@@ -0,0 +1,18 @@
+The Makefile implicit archive format ('Archives' in make.info) from, e.g.
+'libfdutils.a($(LIBFILES))' does not support parallel operations. Convert to
+parallel-safe structure.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- fdutils-5.5-20060227.orig/src/Makefile.in 2019-03-17 13:25:43.891918479 -0700
++++ fdutils-5.5-20060227/src/Makefile.in 2019-03-17 13:30:05.067424657 -0700
+@@ -67,7 +67,7 @@
+ lex.%.c: %.lex
+ lex -P$* $<
+
+-libfdutils.a: libfdutils.a($(LIBFILES))
+- ranlib libfdutils.a
++libfdutils.a: $(LIBFILES)
++ ar rcs $@ $^
+
+ floppycontrol.o getfdprm setfdprm: /usr/include/linux/fd.h
diff --git a/app-misc/fdutils/metadata.xml b/app-misc/fdutils/metadata.xml
index 6f49eba8f49..4073267daf2 100644
--- a/app-misc/fdutils/metadata.xml
+++ b/app-misc/fdutils/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/, app-misc/fdutils/files/
@ 2022-03-15 17:31 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-03-15 17:31 UTC (permalink / raw
To: gentoo-commits
commit: bd003ff3ac0a077118ab9e33783fd9e2408a4274
Author: Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Thu Mar 10 14:26:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 17:31:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd003ff3
app-misc/fdutils: Fix direct calls to "ar"
Closes: https://bugs.gentoo.org/834874
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/24477
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-misc/fdutils/fdutils-5.6_p2.ebuild | 2 ++
.../fdutils/files/fdutils-5.6_p2-variable-ar.patch | 30 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/app-misc/fdutils/fdutils-5.6_p2.ebuild b/app-misc/fdutils/fdutils-5.6_p2.ebuild
index b49bc20f491a..715dea769e48 100644
--- a/app-misc/fdutils/fdutils-5.6_p2.ebuild
+++ b/app-misc/fdutils/fdutils-5.6_p2.ebuild
@@ -39,11 +39,13 @@ src_prepare() {
"${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch # bug 315577
"${FILESDIR}"/fdutils-5.6_p2-parallel.patch
"${FILESDIR}"/fdutils-5.6_p2-docs-build.patch
+ "${FILESDIR}"/fdutils-5.6_p2-variable-ar.patch
)
default
eautoreconf
+ touch ar-lib || die # bug 834874
}
src_configure() {
diff --git a/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch b/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch
new file mode 100644
index 000000000000..14a01ba20677
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.6_p2-variable-ar.patch
@@ -0,0 +1,30 @@
+Add variable for ${AR}
+--- a/configure.in
++++ b/configure.in
+@@ -6,6 +6,7 @@ AC_PROG_MAKE_SET
+
+ dnl Checks for compiler
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -21,6 +21,7 @@ sysconfdir = $(DESTDIR)@sysconfdir@
+ datarootdir = $(DESTDIR)@datarootdir@
+
+ CC = @CC@
++AR = @AR@
+ PID = -DPIDFILE=\"@localstatedir@/run/diskseekd.pid\"
+ DEFINES = $(DEFINES) $(PID) -DSYSCONFDIR=\"@sysconfdir@\"
+ DEFS = @DEFS@ -DSYSCONFDIR=\"@sysconfdir@\"
+@@ -69,7 +70,7 @@ lex.%.c: %.lex
+ lex -P$* $<
+
+ libfdutils.a: $(LIBFILES)
+- ar rcs $@ $^
++ $(AR) rcs $@ $^
+
+ floppycontrol.o getfdprm setfdprm: /usr/include/linux/fd.h
+ diskseekd.o superformat.o fdrawcmd.o: /usr/include/linux/fd.h \
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-15 17:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-17 14:06 [gentoo-commits] repo/gentoo:master commit in: app-misc/fdutils/, app-misc/fdutils/files/ Amy Liffey
-- strict thread matches above, loose matches on Subject: below --
2019-03-17 22:37 Robin H. Johnson
2022-03-15 17:31 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox