rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity
d0814de69b
Mesa/u_remove-os-abi-tag.patch

73 lines
2.6 KiB
Diff
Raw Normal View History

Accepting request 157192 from home:tobijk:X11:XOrg Update to Mesa 9.1 OBS-URL: https://build.opensuse.org/request/show/157192 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=276
2013-03-13 17:30:13 +01:00
From 113326370fcc975af6d6fb5825728995fc8a6c70 Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.klausmann@mni.thm.de>
Date: Fri, 19 Oct 2012 22:46:21 +0200
Subject: [PATCH] Subject: Remove OS ABI tag from libGL, so it is no longer
preferred over libGLs without OS ABI tag References:
bnc#765294, fdo#26663
- u_remove-os-abi-tag.patch * Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag (bnc#765294, fdo#26663) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226
2012-06-12 14:09:17 +02:00
Accepting request 157192 from home:tobijk:X11:XOrg Update to Mesa 9.1 OBS-URL: https://build.opensuse.org/request/show/157192 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=276
2013-03-13 17:30:13 +01:00
Original Author: Stefan Dirsch <sndirsch@suse.de>
changed for Mesa 9.1
---
src/mapi/glapi/gen/gl_x86-64_asm.py | 2 +-
src/mapi/glapi/gen/gl_x86_asm.py | 2 +-
src/mapi/mapi/entry_x86-64_tls.h | 2 +-
src/mapi/mapi/entry_x86_tls.h | 2 +-
4 Dateien geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py
index a3548c2..edfc548 100644
--- a/src/mapi/glapi/gen/gl_x86-64_asm.py
+++ b/src/mapi/glapi/gen/gl_x86-64_asm.py
@@ -181,7 +181,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
- u_remove-os-abi-tag.patch * Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag (bnc#765294, fdo#26663) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226
2012-06-12 14:09:17 +02:00
Accepting request 157192 from home:tobijk:X11:XOrg Update to Mesa 9.1 OBS-URL: https://build.opensuse.org/request/show/157192 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=276
2013-03-13 17:30:13 +01:00
def printRealFooter(self):
print ''
- print '#if defined(GLX_USE_TLS) && defined(__linux__)'
+ print '#if 0 && defined(__linux__)'
print ' .section ".note.ABI-tag", "a"'
print ' .p2align 2'
print ' .long 1f - 0f /* name length */'
diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
index 8b0f6ee..7e8105c 100644
--- a/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/src/mapi/glapi/gen/gl_x86_asm.py
@@ -189,7 +189,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '\t\tALIGNTEXT16'
print 'GLNAME(gl_dispatch_functions_end):'
print ''
- print '#if defined(GLX_USE_TLS) && defined(__linux__)'
+ print '#if 0 && defined(__linux__)'
print ' .section ".note.ABI-tag", "a"'
print ' .p2align 2'
print ' .long 1f - 0f /* name length */'
diff --git a/src/mapi/mapi/entry_x86-64_tls.h b/src/mapi/mapi/entry_x86-64_tls.h
index 72d4125..06d4b3d 100644
--- a/src/mapi/mapi/entry_x86-64_tls.h
+++ b/src/mapi/mapi/entry_x86-64_tls.h
- u_remove-os-abi-tag.patch * Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag (bnc#765294, fdo#26663) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226
2012-06-12 14:09:17 +02:00
@@ -28,7 +28,7 @@
#include "u_macros.h"
-#ifdef __linux__
Accepting request 157192 from home:tobijk:X11:XOrg Update to Mesa 9.1 OBS-URL: https://build.opensuse.org/request/show/157192 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=276
2013-03-13 17:30:13 +01:00
+#ifdef opensuse_dontbuild
- u_remove-os-abi-tag.patch * Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag (bnc#765294, fdo#26663) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226
2012-06-12 14:09:17 +02:00
__asm__(".section .note.ABI-tag, \"a\"\n\t"
".p2align 2\n\t"
".long 1f - 0f\n\t" /* name length */
Accepting request 157192 from home:tobijk:X11:XOrg Update to Mesa 9.1 OBS-URL: https://build.opensuse.org/request/show/157192 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=276
2013-03-13 17:30:13 +01:00
diff --git a/src/mapi/mapi/entry_x86_tls.h b/src/mapi/mapi/entry_x86_tls.h
index de91812..a38d9a0 100644
--- a/src/mapi/mapi/entry_x86_tls.h
+++ b/src/mapi/mapi/entry_x86_tls.h
- u_remove-os-abi-tag.patch * Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag (bnc#765294, fdo#26663) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226
2012-06-12 14:09:17 +02:00
@@ -29,7 +29,7 @@
#include <string.h>
#include "u_macros.h"
-#ifdef __linux__
Accepting request 157192 from home:tobijk:X11:XOrg Update to Mesa 9.1 OBS-URL: https://build.opensuse.org/request/show/157192 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=276
2013-03-13 17:30:13 +01:00
+#ifdef opensuse_dontbuild
- u_remove-os-abi-tag.patch * Remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag (bnc#765294, fdo#26663) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226
2012-06-12 14:09:17 +02:00
__asm__(".section .note.ABI-tag, \"a\"\n\t"
".p2align 2\n\t"
".long 1f - 0f\n\t" /* name length */
Accepting request 157192 from home:tobijk:X11:XOrg Update to Mesa 9.1 OBS-URL: https://build.opensuse.org/request/show/157192 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=276
2013-03-13 17:30:13 +01:00
--
1.7.10.4
Copy Permalink