[apitrace] Fix dlsym hack to work on arm (and probably others)

Adam Jackson ajax at fedoraproject.org
Wed Jun 11 17:03:18 UTC 2014


commit 19d02f6db3f2478315903e132ea27a3fd35fd363
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jun 11 13:03:10 2014 -0400

    Fix dlsym hack to work on arm (and probably others)

 apitrace-5.0_dlsym.patch |    2 +-
 apitrace.spec            |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apitrace-5.0_dlsym.patch b/apitrace-5.0_dlsym.patch
index 5f39153..b1c15bf 100644
--- a/apitrace-5.0_dlsym.patch
+++ b/apitrace-5.0_dlsym.patch
@@ -18,7 +18,7 @@ diff -rupN apitrace-5.0/dispatch/glproc_gl.cpp apitrace-5.0-new/dispatch/glproc_
          void *libdl_handle = _dlopen("libdl.so.2", RTLD_LOCAL | RTLD_NOW);
          if (libdl_handle) {
 -            dlsym_ptr = (PFN_DLSYM)__libc_dlsym(libdl_handle, "dlsym");
-+            dlsym_ptr = (PFN_DLSYM)dlvsym(libdl_handle, "dlsym", "GLIBC_2.2.5");
++            dlsym_ptr = (PFN_DLSYM)dlvsym(libdl_handle, "__libc_dlsym", "GLIBC_PRIVATE");
          }
          if (!dlsym_ptr) {
              os::log("apitrace: error: failed to look up real dlsym\n");
diff --git a/apitrace.spec b/apitrace.spec
index 6deafca..07b5c4c 100644
--- a/apitrace.spec
+++ b/apitrace.spec
@@ -1,6 +1,6 @@
 Name:           apitrace
 Version:        5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for tracing OpenGL
 
 License:        MIT
@@ -111,6 +111,9 @@ chmod 0644 %{buildroot}%{_libdir}/%{name}/scripts/highlight.py
 
 
 %changelog
+* Wed Jun 11 2014 Adam Jackson <ajax at redhat.com> 5.0-3
+- Fix dlsym hack to work on arm (and probably others)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list