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

[Git][xorg-team/lib/mesa][debian-unstable] 2 commits: Revert "Build with gcc-12 and -O1 on ppc64el"



Title: GitLab

Emilio Pozuelo Monfort pushed to branch debian-unstable at X Strike Force / lib / mesa

Commits:

  • ef9a7424
    by Dmitry Shachnev at 2025-02-02T17:20:46+03:00
    Revert "Build with gcc-12 and -O1 on ppc64el"
    
    This reverts commit 5abebb94ed5f5ff9705911220ec9b0b6fcbe5b0d.
    
  • e9e24b7b
    by Dmitry Shachnev at 2025-02-02T17:25:34+03:00
    Add a patch to disable ppc64el assembly code.
    
    Closes: #1092890.
    

6 changed files:

Changes:

  • debian/changelog
    1
    +mesa (24.3.4-3) UNRELEASED; urgency=medium
    
    2
    +
    
    3
    +  * Revert "Build with gcc-12 and -O1 on ppc64el".
    
    4
    +  * Add a patch to disable ppc64el assembly code. (Closes: #1092890)
    
    5
    +
    
    6
    + -- Dmitry Shachnev <mitya57@debian.org>  Sun, 02 Feb 2025 17:20:29 +0300
    
    7
    +
    
    1 8
     mesa (24.3.4-2) unstable; urgency=medium
    
    2 9
     
    
    3 10
       * Build with gcc-12 and -O1 on ppc64el to workaround segfaults
    

  • debian/control
    ... ... @@ -6,8 +6,6 @@ Uploaders: Andreas Boll <aboll@debian.org>
    6 6
     Standards-Version: 4.1.4
    
    7 7
     Build-Depends:
    
    8 8
      debhelper-compat (= 13),
    
    9
    - gcc-12 [ppc64el],
    
    10
    - g++-12 [ppc64el],
    
    11 9
      directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
    
    12 10
      flatbuffers-compiler [linux-arm64],
    
    13 11
      glslang-tools [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    

  • debian/control.in
    ... ... @@ -6,8 +6,6 @@ Uploaders: Andreas Boll <aboll@debian.org>
    6 6
     Standards-Version: 4.1.4
    
    7 7
     Build-Depends:
    
    8 8
      debhelper-compat (= 13),
    
    9
    - gcc-12 [ppc64el],
    
    10
    - g++-12 [ppc64el],
    
    11 9
      directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
    
    12 10
      flatbuffers-compiler [linux-arm64],
    
    13 11
      glslang-tools [@LLVM_ARCHS@],
    

  • debian/patches/disable_ppc64el_assembly.diff
    1
    +Description: disable use of ppc64el assembly code
    
    2
    +Author: Dmitry Shachnev <mitya57@debian.org>
    
    3
    +Bug-Debian: https://bugs.debian.org/1092890
    
    4
    +Last-Update: 2025-02-02
    
    5
    +
    
    6
    +--- a/meson.build
    
    7
    ++++ b/meson.build
    
    8
    +@@ -1319,11 +1319,6 @@ elif host_machine.cpu_family() == 'sparc
    
    9
    +     with_asm_arch = 'sparc'
    
    10
    +     pre_args += ['-DUSE_SPARC_ASM']
    
    11
    +   endif
    
    12
    +-elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 'little'
    
    13
    +-  if system_has_kms_drm
    
    14
    +-    with_asm_arch = 'ppc64le'
    
    15
    +-    pre_args += ['-DUSE_PPC64LE_ASM']
    
    16
    +-  endif
    
    17
    + elif host_machine.cpu_family() == 'mips64' and host_machine.endian() == 'little'
    
    18
    +   if system_has_kms_drm
    
    19
    +     with_asm_arch = 'mips64el'

  • debian/patches/series
    1 1
     path_max.diff
    
    2 2
     src_glx_dri_common.h.diff
    
    3
    +disable_ppc64el_assembly.diff

  • debian/rules
    ... ... @@ -36,12 +36,6 @@ else ifneq (,$(filter $(DEB_HOST_ARCH), sh4))
    36 36
       # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143
    
    37 37
       DEB_CFLAGS_MAINT_APPEND += -freorder-blocks-algorithm=simple
    
    38 38
       DEB_CXXFLAGS_MAINT_APPEND += -freorder-blocks-algorithm=simple
    
    39
    -else ifneq (,$(filter $(DEB_HOST_ARCH), ppc64el))
    
    40
    -  # Workaround for https://bugs.debian.org/1092890
    
    41
    -  DEB_CFLAGS_MAINT_APPEND += -O1
    
    42
    -  DEB_CXXFLAGS_MAINT_APPEND += -O1
    
    43
    -  export CC := gcc-12
    
    44
    -  export CXX := g++-12
    
    45 39
     endif
    
    46 40
     buildflags = $(shell \
    
    47 41
     	DEB_CFLAGS_MAINT_APPEND='$(DEB_CFLAGS_MAINT_APPEND)' \
    


  • Reply to: