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:

- debian/changelog
- debian/control
- debian/control.in
- + debian/patches/disable_ppc64el_assembly.diff
- debian/patches/series
- debian/rules


Changes:

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


=====================================
debian/control
=====================================
@@ -6,8 +6,6 @@ Uploaders: Andreas Boll <[email protected]>
 Standards-Version: 4.1.4
 Build-Depends:
  debhelper-compat (= 13),
- gcc-12 [ppc64el],
- g++-12 [ppc64el],
  directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
  flatbuffers-compiler [linux-arm64],
  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 <[email protected]>
 Standards-Version: 4.1.4
 Build-Depends:
  debhelper-compat (= 13),
- gcc-12 [ppc64el],
- g++-12 [ppc64el],
  directx-headers-dev (>= 1.613.0) [linux-amd64 linux-arm64],
  flatbuffers-compiler [linux-arm64],
  glslang-tools [@LLVM_ARCHS@],


=====================================
debian/patches/disable_ppc64el_assembly.diff
=====================================
@@ -0,0 +1,19 @@
+Description: disable use of ppc64el assembly code
+Author: Dmitry Shachnev <[email protected]>
+Bug-Debian: https://bugs.debian.org/1092890
+Last-Update: 2025-02-02
+
+--- a/meson.build
++++ b/meson.build
+@@ -1319,11 +1319,6 @@ elif host_machine.cpu_family() == 'sparc
+     with_asm_arch = 'sparc'
+     pre_args += ['-DUSE_SPARC_ASM']
+   endif
+-elif host_machine.cpu_family() == 'ppc64' and host_machine.endian() == 
'little'
+-  if system_has_kms_drm
+-    with_asm_arch = 'ppc64le'
+-    pre_args += ['-DUSE_PPC64LE_ASM']
+-  endif
+ elif host_machine.cpu_family() == 'mips64' and host_machine.endian() == 
'little'
+   if system_has_kms_drm
+     with_asm_arch = 'mips64el'


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 path_max.diff
 src_glx_dri_common.h.diff
+disable_ppc64el_assembly.diff


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



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8f233b704bee6006e5e6ac0708b384a3a02015d6...e9e24b7b6e54f86a27f98643bef843457a976505

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/8f233b704bee6006e5e6ac0708b384a3a02015d6...e9e24b7b6e54f86a27f98643bef843457a976505
You're receiving this email because of your account on salsa.debian.org.


Reply via email to