[jhbuild] Revert "distutils: Explicity set install directories"
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] Revert "distutils: Explicity set install directories"
- Date: Fri, 22 Apr 2022 17:18:57 +0000 (UTC)
commit 881e8021d018b11c707c5469daa8fc1e34a6b45b
Author: Patrick Griffis <pgriffis igalia com>
Date: Fri Apr 22 12:18:12 2022 -0500
Revert "distutils: Explicity set install directories"
This reverts commit 45892714ce2e26f5ee7e866f52b83bf9c3c5925b.
This fails CI so clearly needs some more thought. master as-is is
very much broken on my Fedora 36 system though.
jhbuild/modtypes/distutils.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/jhbuild/modtypes/distutils.py b/jhbuild/modtypes/distutils.py
index 9552d0a4..99e13c96 100644
--- a/jhbuild/modtypes/distutils.py
+++ b/jhbuild/modtypes/distutils.py
@@ -70,15 +70,11 @@ class DistutilsModule(Package, DownloadableModule):
srcdir = self.get_srcdir(buildscript)
builddir = self.get_builddir(buildscript)
destdir = self.prepare_installroot(buildscript)
- prefix = buildscript.config.prefix
cmd = [self.python, 'setup.py']
if srcdir != builddir:
cmd.extend(['build', '--build-base', builddir])
cmd.extend(['install',
- '--prefix', prefix,
- '--install-script', os.path.join(prefix, 'bin'),
- '--install-lib', os.path.join(prefix, 'lib'),
- '--install-data', os.path.join(prefix, 'share'),
+ '--prefix', buildscript.config.prefix,
'--root', destdir])
buildscript.execute(cmd, cwd = srcdir, extra_env = self.extra_env)
self.process_install(buildscript, self.get_revision())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]