diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-10-10 11:21:15 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-10-10 11:21:31 +0100 |
| commit | 4f35256247d00b21d10386055070e748b1b3c15b (patch) | |
| tree | f31be94b1fe6666684ddd847f3eadbc7317bbbb6 | |
| parent | x11-misc/sddm: Drop old (diff) | |
| download | gentoo-4f35256247d00b21d10386055070e748b1b3c15b.tar.gz gentoo-4f35256247d00b21d10386055070e748b1b3c15b.tar.bz2 gentoo-4f35256247d00b21d10386055070e748b1b3c15b.zip | |
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@gentoo.org>
| -rw-r--r-- | sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild | 52 | ||||
| -rw-r--r-- | sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch | 11 |
2 files changed, 63 insertions, 0 deletions
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 000000000000..1ae1b2667e54 --- /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 000000000000..84b9c58417f9 --- /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) |