commit: 5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Oct 29 05:55:25 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Oct 29 05:57:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df9f0d6
app-text/calibre: Respect CFLAGS and LDFLAGS Closes: https://bugs.gentoo.org/814308 Closes: https://bugs.gentoo.org/814311 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-text/calibre/calibre-5.30.0.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app-text/calibre/calibre-5.30.0.ebuild b/app-text/calibre/calibre-5.30.0.ebuild index 40fa50fcc40..b01b4920f27 100644 --- a/app-text/calibre/calibre-5.30.0.ebuild +++ b/app-text/calibre/calibre-5.30.0.ebuild @@ -149,13 +149,12 @@ src_prepare() { # Disable unnecessary privilege dropping for bug #287067. sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \ -i setup/install.py || die "sed failed to patch install.py" - - sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ -\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ + sed -e "/^ os.chdir(os.path.join(src_dir, 'build'))$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ '-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ '-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ -'-i', 'Makefile'])" \ +'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \ -e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \ -i setup/build.py || die "sed failed to patch build.py" }
