all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob c608b519f44a75532a208aac1102bb6db13edf1d 1812 bytes (raw)
name: gnu/packages/patches/xpra-6.0-install_libs.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
 
Distribution specific patch, not going upstream

This workaround for Gentoo interferes with our use of --no-compile during
the 'install stage.

diff --git a/setup.py b/setup.py
index 4f066fa8bf..14a9ed65ed 100755
--- a/setup.py
+++ b/setup.py
@@ -760,8 +760,6 @@ if modules_ENABLED:
 # Utility methods for building with Cython

 def do_add_cython_ext(*args, **kwargs):
-    if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
-        return
     if not cython_ENABLED:
         raise ValueError(f"cannot build {args}: cython compilation is disabled")
     if cython_tracing_ENABLED:
@@ -1971,9 +1969,6 @@ else:
             if root_prefix.endswith("/usr"):
                 # ie: "/" or "/usr/src/rpmbuild/BUILDROOT/xpra-0.18.0-0.20160513r12573.fc23.x86_64/"
                 root_prefix = root_prefix[:-4]
-            for x in sys.argv:
-                if x.startswith("--root="):
-                    root_prefix = x[len("--root="):]
             print(f"  root_prefix={root_prefix!r}")
             build_xpra_conf(root_prefix)

@@ -2116,13 +2111,6 @@ else:
             if uinput_ENABLED:
                 add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])

-    # gentoo does weird things, calls --no-compile with build *and* install
-    # then expects to find the cython modules!? ie:
-    #> python2.7 setup.py build -b build-2.7 install --no-compile \
-    # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
-    # otherwise we use the flags to skip pkgconfig
-    if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv):  # noqa: E501
-        pkgconfig = no_pkgconfig

     if OSX and "py2app" in sys.argv:
         import py2app    #@UnresolvedImport

debug log:

solving c608b519f4 ...
found c608b519f4 in https://git.savannah.gnu.org/cgit/guix.git

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.