New upstream version 1.11+repack0

4 files changed, 24 insertions, 2 deletions

diff --git a/PKG-INFO b/PKG-INFO
index 6c8601d..3c35b06 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: macholib
-Version: 1.10
+Version: 1.11
 Summary: Mach-O header analysis and editing
 Home-page: http://bitbucket.org/ronaldoussoren/macholib
 Author: Ronald Oussoren
@@ -31,6 +31,13 @@ Description: macholib can be used to analyze and edit Mach-O headers, the execut
         Release history
         ===============
         
+        macholib 1.11
+        -------------
+        
+        * Add very hacky limited support for @loader_path. This is just
+          enough to deal with extensions and dylibs found in Python
+          binary wheels.
+        
         macholib 1.10
         -------------
         
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 84b8e64..c62e300 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,6 +1,13 @@
 Release history
 ===============
 
+macholib 1.11
+-------------
+
+* Add very hacky limited support for @loader_path. This is just
+  enough to deal with extensions and dylibs found in Python
+  binary wheels.
+
 macholib 1.10
 -------------
 
diff --git a/macholib/MachOStandalone.py b/macholib/MachOStandalone.py
index 03e75bd..c4f5b84 100644
--- a/macholib/MachOStandalone.py
+++ b/macholib/MachOStandalone.py
@@ -23,6 +23,7 @@ class FilteredMachOGraph(MachOGraph):
 
     def locate(self, filename, loader=None):
         newname = super(FilteredMachOGraph, self).locate(filename, loader)
+        print("locate", filename, loader, "->", newname)
         if newname is None:
             return None
         return self.delegate.locate(newname, loader=loader)
@@ -130,6 +131,13 @@ class MachOStandalone(object):
             changemap[node.filename] = dest
 
         def changefunc(path):
+            if path.startswith('@loader_path/'):
+                # XXX: This is a quick hack for py2app: In that
+                # usecase paths like this are found in the load
+                # commands of relocatable wheels. Those don't
+                # need rewriting.
+                return path
+
             res = mm.locate(path)
             rv = changemap.get(res)
             if rv is None and path.startswith('@loader_path/'):
diff --git a/setup.cfg b/setup.cfg
index f3fd849..409910f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [x-metadata]
 name = macholib
-version = 1.10
+version = 1.11
 description = Mach-O header analysis and editing
 long_description_file = 
 	README.txt