* [gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/, sys-fs/diskdev_cmds/files/
@ 2020-06-24 7:14 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-06-24 7:14 UTC (permalink / raw
To: gentoo-commits
commit: 117afaa38e0239aafd03960b7789b5de5bc01789
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 07:14:16 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 07:14:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117afaa3
sys-fs/diskdev_cmds: add libressl support by ernsteiswuerfel
While at it added subslot dependency on openssl/libressl.
Patch-by: ernsteiswuerfel
Closes: https://bugs.gentoo.org/664758
Package-Manager: Portage-2.3.102, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild | 50 ++++++++++++++++++++++
.../files/diskdev_cmds-332.14_p1-AR.patch | 11 +++++
2 files changed, 61 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
new file mode 100644
index 00000000000..99913550e70
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 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="libressl"
+DEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+ "${WORKDIR}"/diskdev_cmds-${PV}.patch
+ "${FILESDIR}"/${PN}-respect-cflags.patch
+ "${FILESDIR}"/${P}-AR.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 newfs_hfs /sbin/mkfs.hfs
+ dosym newfs_hfs /sbin/mkfs.hfsplus
+ dosym fsck_hfs /sbin/fsck.hfs
+ dosym 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-332.14_p1-AR.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
new file mode 100644
index 00000000000..d1b3c6129f2
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-AR.patch
@@ -0,0 +1,11 @@
+--- a/fsck_hfs.tproj/dfalib/Makefile.lnx
++++ b/fsck_hfs.tproj/dfalib/Makefile.lnx
+@@ -9,7 +9,7 @@ CFILES = hfs_endian.c BlockCache.c\
+ OFILES = $(CFILES:.c=.o)
+
+ libdfa.a: $(OFILES)
+- ar rc $@ $?
++ $(AR) rc $@ $?
+
+ clean:
+ $(RM) $(OFILES) libdfa.a
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/, sys-fs/diskdev_cmds/files/
@ 2020-10-10 10:21 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-10-10 10:21 UTC (permalink / raw
To: gentoo-commits
commit: 4f35256247d00b21d10386055070e748b1b3c15b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 10:21:15 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 10:21:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f352562
sys-fs/diskdev_cmds: respct user's LDFLAGS
Reported-by: Diego Elio Pettenò
Fixed-by: Joshua B. Kahlenberg
Closes: https://bugs.gentoo.org/334619
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild | 52 ++++++++++++++++++++++
.../files/diskdev_cmds-332.14_p1-ldflags.patch | 11 +++++
2 files changed, 63 insertions(+)
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
new file mode 100644
index 00000000000..1ae1b2667e5
--- /dev/null
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 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="libressl"
+DEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+ "${WORKDIR}"/diskdev_cmds-${PV}.patch
+ "${FILESDIR}"/${PN}-respect-cflags.patch
+ "${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/${P}-no-sysctl.patch
+ "${FILESDIR}"/${P}-ldflags.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 newfs_hfs /sbin/mkfs.hfs
+ dosym newfs_hfs /sbin/mkfs.hfsplus
+ dosym fsck_hfs /sbin/fsck.hfs
+ dosym 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-332.14_p1-ldflags.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch
new file mode 100644
index 00000000000..84b9c58417f
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/newfs_hfs.tproj/Makefile.lnx
++++ b/newfs_hfs.tproj/Makefile.lnx
+@@ -4,7 +4,7 @@ OFILES = $(CFILES:.c=.o)
+ all: newfs_hfs
+
+ newfs_hfs: $(OFILES)
+- ${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lcrypto
++ ${CC} ${CFLAGS} -o newfs_hfs ${OFILES} ${LDFLAGS} -lcrypto
+
+ clean:
+ $(RM) newfs_hfs $(OFILES)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-10 10:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-10 10:21 [gentoo-commits] repo/gentoo:master commit in: sys-fs/diskdev_cmds/, sys-fs/diskdev_cmds/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-06-24 7:14 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox