summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2021-10-28 22:55:25 -0700
committerZac Medico <zmedico@gentoo.org>2021-10-28 22:57:47 -0700
commit5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5 (patch)
treef7286daa5dbf2c9a0aba5d12d7ba2f4be701ad0f /app-text/calibre
parentsys-fs/ntfs3g: ppc64 stable wrt bug #818703 (diff)
downloadgentoo-5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5.tar.gz
gentoo-5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5.tar.bz2
gentoo-5df9f0d616ca5a7cc98e8813b3bcb8276ae25fd5.zip
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@gentoo.org>
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/calibre-5.30.0.ebuild7
1 files 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 40fa50fcc405..b01b4920f276 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"
}