diff options
author | Jakov Smolic <jakov.smolic@sartura.hr> | 2021-04-12 21:02:39 +0100 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2021-04-14 09:25:43 +0300 |
commit | 69b9449877745ccd238def39c498b53f60f22c1c (patch) | |
tree | b752b9e7cbfa42cd82b18d44b29c53ba0dd19c36 /sys-kernel/dracut-crypt-ssh | |
parent | media-gfx/flameshot: add Github as 2ndary HOMEPAGE (diff) | |
download | gentoo-69b9449877745ccd238def39c498b53f60f22c1c.tar.gz gentoo-69b9449877745ccd238def39c498b53f60f22c1c.tar.bz2 gentoo-69b9449877745ccd238def39c498b53f60f22c1c.zip |
sys-kernel/dracut-crypt-ssh: Fix building with --as-needed
Closes: https://bugs.gentoo.org/781125
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/20355
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-kernel/dracut-crypt-ssh')
-rw-r--r-- | sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild | 2 | ||||
-rw-r--r-- | sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-makefile.patch (renamed from sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-ldflags.patch) | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild index 78fda89d1943..a403202d1903 100644 --- a/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild +++ b/sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild @@ -25,7 +25,7 @@ RDEPEND="${DEPEND} ) net-misc/dropbear" -PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_configure() { tc-export CC diff --git a/sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-ldflags.patch b/sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-makefile.patch index 5783ab2b516a..d45bc41ed60a 100644 --- a/sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-ldflags.patch +++ b/sys-kernel/dracut-crypt-ssh/files/dracut-crypt-ssh-1.0.7-makefile.patch @@ -1,4 +1,5 @@ # https://bugs.gentoo.org/726014 +# https://bugs.gentoo.org/781125 --- a/modules/60crypt-ssh/helper/Makefile +++ b/modules/60crypt-ssh/helper/Makefile @@ -17,11 +17,11 @@ clean: @@ -10,7 +11,7 @@ unlock: crypttab.o unlock.o - $(CC) $(CFLAGS) -lblkid $^ -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -lblkid $^ -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -lblkid -o $@ crypttab-test: crypttab-test.c crypttab.o crypttab-test-data - $(CC) crypttab-test.c $(CFLAGS) crypttab.o -lblkid -o crypttab-test |