GNOME Bugzilla – Bug 664282
Adjust shlibs.py to OpenBSD libtool
Last modified: 2015-02-07 17:02:52 UTC
Created attachment 201596 [details] [review] Fix giscanner on OpenBSD with non-gnu libtool. OpenBSD uses it's own libtool implementation which breaks giscanner in certain situations. Attached is a patch that adjusts shlibs.py to run ldd on the actual file instead of wrapper script. OK to push this?
Review of attachment 201596 [details] [review]: This should really be a git format-patch style patch. ::: giscanner/shlibs.py.orig @@ +74,3 @@ + # by inserting '.libs/'. + old_argdir = binary.args[0] + new_libsdir = os.path.dirname(binary.args[0]) + '/.libs/' Should use: new_libsdir = os.path.join(os.path.dirname(binary.args[0], '.libs') Is there a reason it has to end with a trailing / ?
The trailing slash has to be there otherwise it breaks: ldd: /usr/obj/ports/ethos-0.2.2/ethos-0.2.2/ethos/tmp-introspect5SAeC0/Ethos-1.0 : not an ELF executable Error while executing ldd /usr/obj/ports/ethos-0.2.2/ethos-0.2.2/ethos/tmp-intro spect5SAeC0/Ethos-1.0 ERROR: can't resolve libraries to shared libraries: ethos-1.0 Attached is a properly formatted patch.
Created attachment 201654 [details] [review] Adjust to OpenBSD libtool
Argh, forgot to git add before a git commit --amend, anyway, the previous patch does need a trailing '/'. When this is OK I'll push the right diff.
Review of attachment 201654 [details] [review]: It's not beautiful, but not much of this bit of the code is. If it works for you, it's fine by me to add.
Thanks.
[Mass-moving gobject-introspection tickets to its own Bugzilla product - see bug 708029. Mass-filter your bugmail for this message: introspection20150207 ]