* [gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/files/, sys-fs/diskdev_cmds/
@ 2019-09-28 12:37 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2019-09-28 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 64f7994bfc3e10a272af065482961553299453bf
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 12:35:54 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 12:37:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f7994b
sys-fs/diskdev_cmds: bump up to EAPI=7
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild | 46 ++++++++++++++++++++++
.../files/diskdev_cmds-respect-cflags.patch | 4 +-
2 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild
new file mode 100644
index 00000000000..9a8a9f2239d
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=${PV%_p*}
+
+DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
+HOMEPAGE="http://opendarwin.org"
+SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
+ mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
+LICENSE="APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+ "${WORKDIR}"/diskdev_cmds-${PV}.patch
+ "${FILESDIR}"/diskdev_cmds-respect-cflags.patch
+)
+
+src_compile() {
+ emake -f Makefile.lnx AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+ into /
+ dosbin fsck_hfs.tproj/fsck_hfs
+ dosbin newfs_hfs.tproj/newfs_hfs
+ dosym /sbin/newfs_hfs /sbin/mkfs.hfs
+ dosym /sbin/newfs_hfs /sbin/mkfs.hfsplus
+ dosym /sbin/fsck_hfs /sbin/fsck.hfs
+ dosym /sbin/fsck_hfs /sbin/fsck.hfsplus
+ doman newfs_hfs.tproj/newfs_hfs.8
+ newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
+ newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
+ doman fsck_hfs.tproj/fsck_hfs.8
+ newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
+ newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
+}
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch
index 3f939f61163..8acafce6c91 100644
--- a/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-respect-cflags.patch
@@ -1,5 +1,5 @@
---- Makefile.lnx.bak 2009-07-22 11:58:10.000000000 -0400
-+++ Makefile.lnx 2009-07-22 11:57:37.000000000 -0400
+--- a/Makefile.lnx.bak 2009-07-22 11:58:10.000000000 -0400
++++ b/Makefile.lnx 2009-07-22 11:57:37.000000000 -0400
@@ -1,5 +1,5 @@
CC := gcc
-CFLAGS := -g3 -Wall -I$(PWD)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/files/, sys-fs/diskdev_cmds/
@ 2020-08-19 20:43 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2020-08-19 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 0e18040d345fe623061142cca2a8e0c43ff332e8
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 20:43:21 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 20:43:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e18040d
sys-fs/diskdev_cmds: tweak for glibc-2.32
It does not fix build on musl but fixes build on glibc-2.32.
Reported-by: Georg Rudoy
Bug: https://bugs.gentoo.org/715862
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild | 1 +
.../files/diskdev_cmds-332.14_p1-no-sysctl.patch | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
index d65d92da320..57753cb339c 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
"${WORKDIR}"/diskdev_cmds-${PV}.patch
"${FILESDIR}"/${PN}-respect-cflags.patch
"${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/${P}-no-sysctl.patch
)
src_compile() {
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch
new file mode 100644
index 00000000000..f7ff186ca19
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch
@@ -0,0 +1,12 @@
+--- a/newfs_hfs.tproj/makehfs.c
++++ b/newfs_hfs.tproj/makehfs.c
+@@ -37,8 +37,8 @@
+ #endif
+ #include <sys/errno.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
+ #if !LINUX
++#include <sys/sysctl.h>
+ #include <sys/vmmeter.h>
+ #endif
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/files/, sys-fs/diskdev_cmds/
@ 2021-01-06 21:51 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2021-01-06 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 1dcb636abf0488aec91b2c22e6279ee53f8c18d4
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 21:50:53 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 21:51:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcb636a
sys-fs/diskdev_cmds: adapt to musl
Reported-by: Toralf Förster
Fixed-by: ernsteiswuerfel
Closes: https://bugs.gentoo.org/715862
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild | 3 +-
.../files/diskdev_cmds-332.14_p1-musl.patch | 79 ++++++++++++++++++++++
2 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
index 3fe0634bc4f..16b057b2ea3 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${P}-AR.patch
"${FILESDIR}"/${P}-no-sysctl.patch
"${FILESDIR}"/${P}-ldflags.patch
+ "${FILESDIR}"/${P}-musl.patch
)
src_compile() {
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
new file mode 100644
index 00000000000..7e7c3d1d310
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-musl.patch
@@ -0,0 +1,79 @@
+Port to musl.
+
+Patch-by: ernsteiswuerfel
+Bug: https://bugs.gentoo.org/715862
+--- a/fsck_hfs.tproj/dfalib/CatalogCheck.c
++++ b/fsck_hfs.tproj/dfalib/CatalogCheck.c
+@@ -23,6 +23,7 @@
+ #include "Scavenger.h"
+ #include "DecompDataEnums.h"
+ #include "DecompData.h"
++#include <sys/types.h>
+
+ /*
+ * information collected when visiting catalog records
+--- a/fsck_hfs.tproj/dfalib/SRepair.c
++++ b/fsck_hfs.tproj/dfalib/SRepair.c
+@@ -35,6 +35,7 @@
+ #include "Scavenger.h"
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <stdlib.h>
+ #include "../cache.h"
+
+--- a/fsck_hfs.tproj/dfalib/Scavenger.h
++++ b/fsck_hfs.tproj/dfalib/Scavenger.h
+@@ -44,7 +44,7 @@
+ #include <sys/kauth.h>
+ #include <sys/syslimits.h>
+ #endif
+-#include <sys/errno.h>
++#include <errno.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+--- a/fsck_hfs.tproj/fsck_hfs.h
++++ b/fsck_hfs.tproj/fsck_hfs.h
+@@ -24,6 +24,9 @@
+
+ #include "cache.h"
+
++#ifndef __P
++#define __P(args) args
++#endif
+
+ const extern char *cdevname; /* name of device being checked */
+ extern char *progname;
+--- a/newfs_hfs.tproj/makehfs.c
++++ b/newfs_hfs.tproj/makehfs.c
+@@ -35,7 +35,6 @@
+ #include <time.h>
+ #include "missing.h"
+ #endif
+-#include <sys/errno.h>
+ #include <sys/stat.h>
+ #if !LINUX
+ #include <sys/sysctl.h>
+@@ -69,6 +68,9 @@ extern Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *b
+ #include "newfs_hfs.h"
+ #include "readme.h"
+
++#ifndef __P
++#define __P(args) args
++#endif
+
+ #define HFS_BOOT_DATA "/usr/share/hfsprogs/hfsbootdata"
+
+--- a/newfs_hfs.tproj/newfs_hfs.c
++++ b/newfs_hfs.tproj/newfs_hfs.c
+@@ -54,6 +54,9 @@
+ #else
+ #include <varargs.h>
+ #endif
++#ifndef __P
++#define __P(args) args
++#endif
+
+ #define NOVAL (-1)
+ #define UMASK (0755)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-06 21:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-06 21:51 [gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/files/, sys-fs/diskdev_cmds/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-08-19 20:43 Sergei Trofimovich
2019-09-28 12:37 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox