Skip to content

Commit

Permalink
XCB: exclude only libxcb-dri
Browse files Browse the repository at this point in the history
  • Loading branch information
@lvillani
lvillani committed Jun 23, 2014
1 parent 34be811 commit 4a6d74a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions PyInstaller/depend/dylib.py
View file
Expand Up @@ -89,10 +89,10 @@
r'/libutil\.so\..*': 1,
# libGL can reference some hw specific libraries (like nvidia libs).
r'/libGL\..*': 1,
# libxcb changes ABI frequently (e.g.: between Ubuntu LTS releases) and is
# usually installed as dependency of the graphics stack anyway. No need to
# bundle it.
r'/libxcb.*\.so\..*': 1,
# libxcb-dri changes ABI frequently (e.g.: between Ubuntu LTS releases) and is usually installed
# as dependency of the graphics stack anyway. No need to bundle it.
r'/libxcb\.so\..*': 1,
r'/libxcb-dri.*\.so\..*': 1,
}

_aix_excludes = {
Expand Down

5 comments on commit 4a6d74a

@jhgoebbert
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix is not part of PyInstaller (development version 3.2) yet.
For me and (http://stackoverflow.com/questions/36285903/pyinstaller-unable-to-compile-script-to-be-completely-standalone) it would fix an issue with libxcb if package has been build on CentOS-6.

@htgoebel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh? code is contained in 3.2, see https://github.com/pyinstaller/pyinstaller/blob/v3.2/PyInstaller/depend/dylib.py#L133. if something is wrong here, please submit a pull-request. Thanks.

@jhgoebbert
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, you are right - the fix is part of 3.2.

The title of the commit was missleading: This fix does not 'exclude only libxcb-dri' - but also libxcb.
I have to include libxcb to make my packages from CentOS 6 run on any other distribution.

I would suggest to include libxcb ...

@durden
Copy link
Contributor

@durden durden commented on 4a6d74a May 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've recently run into this when upgrading PyInstaller and creating some builds for CentOS-6.4 cluster machines that do not come with xcb libs by default. Is there a better way to include these libs or have more control what libs to include via the command-line?

I'm currently maintaining my own fork of PyInstaller 3.2 with only a single change, to include xcb libs. This isn't a problem, just wondering if there's a better way for me to handle it.

@lvillani
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that libxcb and libxcb-dri should either be included or excluded together.

Please sign in to comment.