767403 - Fix dependent libs generation on *BSD after bug 763893

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Landry Breuil (:gaston)]

dependentlibs.py has the following snippet :

if ext == '.dll':
    func = dependentlibs_dumpbin
elif ext == '.so':
    func = dependentlibs_readelf
elif ext == '.dylib':
    func = dependentlibs_otool

This doesnt take into account all bsd platforms where configure.in sets DLL_SUFFIX to .so.1.0 (or to our controlled-versionning lib variable .so.${SO_VERSION} on OpenBSD), so this breaks with cryptic messages :

Traceback (most recent call last):
  File "/home/buildslave/mozilla-central-i386/build/xpcom/stub/dependentlibs.py", line 102, in <module>
    main()
  File "/home/buildslave/mozilla-central-i386/build/xpcom/stub/dependentlibs.py", line 99, in main
    print '\n'.join(dependentlibs(lib, options.libpaths, func))
UnboundLocalError: local variable 'func' referenced before assignment

I'd suggest matching elf platforms with elif ext[0:3] == '.so':, which i'm testing right now and will post a patch for if it works.

Comment 1

[Landry Breuil (:gaston)]

Actually it's a bit more complicated since splitext returns .0 as ext...

Comment 2

[Landry Breuil (:gaston)]

Attachment: also match libname on lib.*.so.*

re.match on lib.*\.so\..* fixes the issue for me and probably netbsd/freebsd

Comment 3

[Landry Breuil (:gaston)]

Attachment: also match libname on lib.*.so.*

New patch rebased after #767024

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 636154 [details] [diff] [review]
also match libname on lib.*.so.*

Review of attachment 636154 [details] [diff] [review]:
-----------------------------------------------------------------

::: xpcom/stub/dependentlibs.py
@@ +94,5 @@
>      lib = args[0]
>      ext = os.path.splitext(lib)[1]
>      if ext == '.dll':
>          func = dependentlibs_dumpbin
> +    elif ext == '.so' or re.match('lib.*\.so\..*',lib):

Please use fnmatch.fnmatch instead.

Comment 5

[Landry Breuil (:gaston)]

Attachment: use fnmatch to match lib*.so.*

Sure, that also works and is nicer (my python fu is weak)

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 636817 [details] [diff] [review]
use fnmatch to match lib*.so.*

Review of attachment 636817 [details] [diff] [review]:
-----------------------------------------------------------------

::: xpcom/stub/dependentlibs.py
@@ +95,5 @@
>      lib = args[0]
>      ext = os.path.splitext(lib)[1]
>      if ext == '.dll':
>          func = dependentlibs_dumpbin
> +    elif ext == '.so' or fnmatch.fnmatch(lib,'lib*.so.*'):

Please add a whitespace after the comma.

I think you can lift the lib prefix and just use *.so.*

Comment 7

[Landry Breuil (:gaston)]

Right, pushed it that way.

https://hg.mozilla.org/integration/mozilla-inbound/rev/c7b0713958d6

Comment 8

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/c7b0713958d6