Skip to content

Commit

Permalink
Added version numbers to dynamic libraries as observed by
Browse files Browse the repository at this point in the history 
@mdimjasevic
  • Loading branch information
@ianamason
ianamason committed May 27, 2016
1 parent b549b88 commit 17f2e85
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions driver/utils.py
View file
Expand Up @@ -234,6 +234,9 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
#iam: the object file recogition is not really very robust, object files
# should be determined by their existance and contents...
r'^.+\.(o|lo|So|so|po|a|dylib)$' : (0, ArgumentListFilter.objectFileCallback),
#iam: library.so.4.5.6 probably need a similar pattern for .dylib too.
r'^.+\.dylib(\.\d)+$' : (0, ArgumentListFilter.objectFileCallback),
r'^.+\.(So|so)(\.\d)+$' : (0, ArgumentListFilter.objectFileCallback),
r'^-(l|L).+$' : (0, ArgumentListFilter.linkUnaryCallback),
r'^-I.+$' : (0, ArgumentListFilter.compileUnaryCallback),
r'^-D.+$' : (0, ArgumentListFilter.compileUnaryCallback),
Expand Down

6 comments on commit 17f2e85

@mdimjasevic
Copy link

Choose a reason for hiding this comment

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

Thx @ianamason for fixing this!

Are you going to push this upstream as well?

I'm not familiar with this fork. Would you say a bit about it?

@ianamason
Copy link
Member Author

@ianamason ianamason commented on 17f2e85 May 27, 2016 via email

Choose a reason for hiding this comment

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

@mdimjasevic
Copy link

Choose a reason for hiding this comment

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

@ianamason, I'd like to get this commit into the upstream repo. Of course, I could do a plain c-p of the code, but is there a better way that would keep as much of the commit's metadata as possible, e.g. your name, the timestamp, etc.?

@ianamason
Copy link
Member Author

Choose a reason for hiding this comment

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

Marko,

SRI's fork is probably going to start moving again, since we have more tasks for it to do, so ...

I'm happy for you to do whatever with the fix. But if you do try to push it upstream, can you try and
push the mac segment name fix too. No reason for his version not to run on a mac again ....

@mdimjasevic
Copy link

Choose a reason for hiding this comment

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

Hi Ian,

I have no write permissions to the upstream repo so whatever I do, I do it through pull requests from a fork. I am not a Mac user nor I develop on or for Mac, so I don't have a way of testing Mac-specific changes, which would be a reasonable thing to do before making a pull request. I'm using solely GNU/Linux and, looking at this narrowly, I'm happy as long as GNU/Linux-specific changes are committed.

I don't know if anyone of the guys that do have write permissions on the upstream repo use Mac. If not, it would make sense to consider adding the permissions to someone that does use Mac, e.g. you.

@ianamason
Copy link
Member Author

Choose a reason for hiding this comment

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

OK no problem.

I may end up making a pip package on the next iteration ....

Please sign in to comment.