[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/mesa][debian-unstable] control, rules: Re-enable LLVM support on riscv64.



Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa

Commits:

  • 97dc15f6
    by Zhang Boyang at 2022-09-22T01:28:56+08:00
    control, rules: Re-enable LLVM support on riscv64.
    
    LLVM support on riscv64 was disabled by 9ff618fbbe24 ("Disable LLVM
    support on riscv64, it doesn't have JIT. (Closes: #995618)"). Latest
    LLVM has JIT support for riscv64, so re-enable it.
    

2 changed files:

Changes:

  • debian/control
    ... ... @@ -43,10 +43,10 @@ Build-Depends:
    43 43
      libelf-dev [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    
    44 44
      libwayland-dev (>= 1.15.0) [linux-any],
    
    45 45
      libwayland-egl-backend-dev (>= 1.15.0) [linux-any],
    
    46
    - llvm-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    47
    - libclang-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    48
    - libclang-cpp14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    49
    - libclc-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64],
    
    46
    + llvm-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    
    47
    + libclang-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    
    48
    + libclang-cpp14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    
    49
    + libclc-14-dev [amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64],
    
    50 50
      wayland-protocols (>= 1.9),
    
    51 51
      zlib1g-dev,
    
    52 52
      libglvnd-core-dev (>= 1.3.2),
    
    ... ... @@ -413,7 +413,7 @@ Description: Mesa Vulkan graphics drivers
    413 413
     
    
    414 414
     Package: mesa-opencl-icd
    
    415 415
     Section: libs
    
    416
    -Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64
    
    416
    +Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64
    
    417 417
     Pre-Depends: ${misc:Pre-Depends}
    
    418 418
     Depends:
    
    419 419
      libclc-14,
    

  • debian/rules
    ... ... @@ -62,7 +62,7 @@ else
    62 62
     
    
    63 63
       # radv/lavapipe needs LLVM and the Vulkan loader, so only build on the subset of
    
    64 64
       # arches where we have LLVM enabled and where the Vulkan loader is built.
    
    65
    -  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
    
    65
    +  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64))
    
    66 66
     	VULKAN_DRIVERS += amd swrast
    
    67 67
       endif
    
    68 68
     
    
    ... ... @@ -111,7 +111,7 @@ else
    111 111
     
    
    112 112
       # LLVM is required for building r300g, radeonsi and llvmpipe drivers.
    
    113 113
       # It's also required for building OpenCL support.
    
    114
    -  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64))
    
    114
    +  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64))
    
    115 115
     	GALLIUM_DRIVERS += radeonsi
    
    116 116
     	confflags_GALLIUM += -Dllvm=enabled
    
    117 117
     	confflags_GALLIUM += -Dgallium-opencl=icd
    


  • Reply to: