* [gentoo-commits] repo/gentoo:master commit in: sys-fs/mtd-utils/files/, sys-fs/mtd-utils/
@ 2016-04-17 2:20 Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2016-04-17 2:20 UTC (permalink / raw
To: gentoo-commits
commit: 0194567625da237b25ff55bdc95190592a690962
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 02:14:51 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 02:17:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01945676
sys-fs/mtd-utils: fix building w/newer glibc #580206
.../files/mtd-utils-1.5.2-sysmacros.patch | 32 ++++++++++++++++++++++
sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild | 4 +++
2 files changed, 36 insertions(+)
diff --git a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch b/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
new file mode 100644
index 0000000..5fc055d
--- /dev/null
+++ b/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/580206
+
+From 9a06f45ec71116d76ee4b268ebe1b33d45b06fc0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 16 Apr 2016 22:10:43 -0400
+Subject: [PATCH mtd-utils] include sys/sysmacros.h for major/minor/makedev
+
+These functions have always been defined in sys/sysmacros.h under
+Linux C libraries. For some, including sys/types.h implicitly
+includes that as well, but glibc wants to deprecate that, and some
+others already have. Include the header explicitly for the funcs.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ include/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/common.h b/include/common.h
+index fb0ca83..8cb3142 100644
+--- a/include/common.h
++++ b/include/common.h
+@@ -28,6 +28,7 @@
+ #include <errno.h>
+ #include <features.h>
+ #include <inttypes.h>
++#include <sys/sysmacros.h>
+ #include "version.h"
+
+ #ifndef PROGRAM_NAME
+--
+2.7.4
+
diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
index 26c0a62..176261d 100644
--- a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
@@ -40,6 +40,10 @@ RDEPEND="!sys-fs/mtd
DEPEND="${RDEPEND}
xattr? ( sys-apps/acl )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-sysmacros.patch #580206
+}
+
makeopts() {
# These affect build output, so keep it common between compile & install.
echo CROSS=${CHOST}- V=1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/mtd-utils/files/, sys-fs/mtd-utils/
@ 2021-01-23 10:43 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-01-23 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 42c41fd0d1353645d505fa29c9acd11c37f3555c
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Jan 23 10:43:29 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 10:43:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c41fd0
sys-fs/mtd-utils: Remove old (EAPI 5)
Closes: https://github.com/gentoo/gentoo/pull/19169
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-fs/mtd-utils/Manifest | 2 -
.../files/mtd-utils-1.5.2-sysmacros.patch | 32 -----------
sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild | 65 ----------------------
sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild | 60 --------------------
4 files changed, 159 deletions(-)
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index e714b58a58c..3d9a152fe05 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,3 +1 @@
-DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897c4af0c442a6206a446dc25f3c2aae9670c9344fba09606f73b87c73a96150f77bd974c96abe475d204ba5c28068 SHA512 81eb5cf27814234af65409fe93798ec50d9f733978dc606bd33e63d98eb99afb3f988df47dc66a9368a11baee0a35fa1d0d6677af8c23428919e34bd11a25697
-DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5ac3917392a407c7824f8715f4a180feab95621e6b1aa738fba38950c8e12b722b7c518c3362227e6da25deecd3fb SHA512 e61f4bb24d3b96d39fe262f73e01b7bf3e15a9258fd5766657ef0d807d7b5bb0b489ade9dc45068b2a25bcf378ca2877177df3915398b367f50ff1ef9bc5be7a
DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921
diff --git a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch b/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
deleted file mode 100644
index 5fc055d07da..00000000000
--- a/sys-fs/mtd-utils/files/mtd-utils-1.5.2-sysmacros.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/580206
-
-From 9a06f45ec71116d76ee4b268ebe1b33d45b06fc0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 16 Apr 2016 22:10:43 -0400
-Subject: [PATCH mtd-utils] include sys/sysmacros.h for major/minor/makedev
-
-These functions have always been defined in sys/sysmacros.h under
-Linux C libraries. For some, including sys/types.h implicitly
-includes that as well, but glibc wants to deprecate that, and some
-others already have. Include the header explicitly for the funcs.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- include/common.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/common.h b/include/common.h
-index fb0ca83..8cb3142 100644
---- a/include/common.h
-+++ b/include/common.h
-@@ -28,6 +28,7 @@
- #include <errno.h>
- #include <features.h>
- #include <inttypes.h>
-+#include <sys/sysmacros.h>
- #include "version.h"
-
- #ifndef PROGRAM_NAME
---
-2.7.4
-
diff --git a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild b/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
deleted file mode 100644
index d319387dee4..00000000000
--- a/sys-fs/mtd-utils/mtd-utils-1.5.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils vcs-snapshot toolchain-funcs
-
-if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
-
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- if [[ ${PV} == *.*.* ]] ; then
- MY_PV="${PV}-*"
- SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
- else
- MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
- SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
- fi
- KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="xattr"
-
-# We need libuuid
-RDEPEND="!sys-fs/mtd
- dev-libs/lzo
- sys-libs/zlib
- >=sys-apps/util-linux-2.16"
-# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
-# And ACL brings in Attr as well.
-DEPEND="${RDEPEND}
- xattr? ( sys-apps/acl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch #580206
-}
-
-makeopts() {
- # These affect build output, so keep it common between compile & install.
- echo CROSS=${CHOST}- V=1
- use xattr || echo WITHOUT_XATTR=1
-}
-
-src_compile() {
- tc-export AR CC RANLIB
- local compileopts=(
- AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
- )
- emake $(makeopts) "${compileopts[@]}"
-}
-
-src_install() {
- emake $(makeopts) install DESTDIR="${ED}"
- dodoc *.txt
- newdoc mkfs.ubifs/README README.mkfs.ubifs
- # TODO: check ubi-utils for docs+scripts
-}
diff --git a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
deleted file mode 100644
index 0fe8a0ccf74..00000000000
--- a/sys-fs/mtd-utils/mtd-utils-2.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils vcs-snapshot
-
-if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
-
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- if [[ ${PV} == *.*.* ]] ; then
- MY_PV="${PV}-*"
- SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
- else
- MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
- SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
- fi
- KEYWORDS="amd64 arm ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="xattr"
-
-# We need libuuid
-RDEPEND="!sys-fs/mtd
- dev-libs/lzo
- sys-libs/zlib
- >=sys-apps/util-linux-2.16"
-# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
-# And ACL brings in Attr as well.
-DEPEND="${RDEPEND}
- xattr? ( sys-apps/acl )
- sys-devel/libtool"
-
-src_prepare() {
- default
- ./autogen.sh || die
-}
-
-src_configure() {
- econf \
- $(use_with xattr)
-}
-
-src_install() {
- default
- dodoc jffsX-utils/device_table.txt
- newdoc ubifs-utils/mkfs.ubifs/README README.mkfs.ubifs
- doman \
- jffsX-utils/mkfs.jffs2.1 \
- ubi-utils/ubinize.8
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/mtd-utils/files/, sys-fs/mtd-utils/
@ 2022-08-22 8:18 Jakov Smolić
0 siblings, 0 replies; 3+ messages in thread
From: Jakov Smolić @ 2022-08-22 8:18 UTC (permalink / raw
To: gentoo-commits
commit: f96d62cdb6a8a6e6bf36b83b96ac047ade701149
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 08:15:28 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 08:15:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96d62cd
sys-fs/mtd-utils: Add glibc-2.36 patch
Closes: https://bugs.gentoo.org/864346
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
.../files/mtd-utils-2.1.4-glibc-2.36.patch | 17 ++++++++
sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild | 47 ++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/sys-fs/mtd-utils/files/mtd-utils-2.1.4-glibc-2.36.patch b/sys-fs/mtd-utils/files/mtd-utils-2.1.4-glibc-2.36.patch
new file mode 100644
index 000000000000..69bd1009945f
--- /dev/null
+++ b/sys-fs/mtd-utils/files/mtd-utils-2.1.4-glibc-2.36.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/864346
+
+X-Git-Url: https://git.infradead.org/mtd-utils.git/blobdiff_plain/a315011bd3c237660436e0c796743d61acf4a7b6..ac98b3fc7cb9c122bea4b5d1d351727eb4ea0bac:/tests/fs-tests/lib/tests.c
+
+diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c
+index d1a2e0c..3db0426 100644
+--- a/tests/fs-tests/lib/tests.c
++++ b/tests/fs-tests/lib/tests.c
+@@ -35,7 +35,6 @@
+ #include <sys/vfs.h>
+ #include <sys/mount.h>
+ #include <sys/statvfs.h>
+-#include <linux/fs.h>
+ #include <linux/jffs2.h>
+
+ #include "tests.h"
+
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..615da14e7db2
--- /dev/null
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
+HOMEPAGE="https://git.infradead.org/?p=mtd-utils.git;a=summary"
+SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+lzo xattr +zstd"
+
+DEPEND="
+ sys-apps/util-linux:=
+ sys-libs/zlib:=
+ lzo? ( dev-libs/lzo:= )
+ xattr? ( sys-apps/acl )
+ zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( jffsX-utils/device_table.txt ubifs-utils/mkfs.ubifs/README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-glibc-2.36.patch
+)
+
+src_prepare() {
+ default
+ sed -i '/if test.*then/s: == : = :' configure || die
+}
+
+src_configure() {
+ econf \
+ $(use_with lzo) \
+ $(use_with xattr) \
+ $(use_with zstd)
+}
+
+src_install() {
+ default
+ doman \
+ jffsX-utils/mkfs.jffs2.1 \
+ ubi-utils/ubinize.8
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-22 8:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-22 8:18 [gentoo-commits] repo/gentoo:master commit in: sys-fs/mtd-utils/files/, sys-fs/mtd-utils/ Jakov Smolić
-- strict thread matches above, loose matches on Subject: below --
2021-01-23 10:43 David Seifert
2016-04-17 2:20 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox