diff options
Diffstat (limited to 'lib/portage/util/lafilefixer.py')
| -rw-r--r-- | lib/portage/util/lafilefixer.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/portage/util/lafilefixer.py b/lib/portage/util/lafilefixer.py index 59df30b4b..870c6d97b 100644 --- a/lib/portage/util/lafilefixer.py +++ b/lib/portage/util/lafilefixer.py @@ -20,7 +20,7 @@ from portage.exception import InvalidData # are ignored by libtool (last one wins), but we treat it as error (like # lafilefixer does). # What it does: -# * Replaces all .la files with absolut paths in dependency_libs with +# * Replaces all .la files with absolute paths in dependency_libs with # corresponding -l* and -L* entries # (/usr/lib64/libfoo.la -> -L/usr/lib64 -lfoo) # * Moves various flags (see flag_re below) to inherited_linker_flags, @@ -40,8 +40,8 @@ inh_link_flags_re = re.compile(b"inherited_linker_flags='(?P<value>[^']*)'$") # replace 'X11R6/lib' and 'local/lib' with 'lib', no idea what's this about. X11_local_sub = re.compile(b"X11R6/lib|local/lib") # get rid of the '..' -pkgconfig_sub1 = re.compile(br"usr/lib[^/]*/pkgconfig/\.\./\.\.") -pkgconfig_sub2 = re.compile(br"(?P<usrlib>usr/lib[^/]*)/pkgconfig/\.\.") +pkgconfig_sub1 = re.compile(rb"usr/lib[^/]*/pkgconfig/\.\./\.\.") +pkgconfig_sub2 = re.compile(rb"(?P<usrlib>usr/lib[^/]*)/pkgconfig/\.\.") # detect flags that should go into inherited_linker_flags instead of dependency_libs flag_re = re.compile( @@ -135,7 +135,7 @@ def rewrite_lafile(contents): ladir = X11_local_sub.sub(b"lib", ladir) ladir = pkgconfig_sub1.sub(b"usr", ladir) - ladir = pkgconfig_sub2.sub(br"\g<usrlib>", ladir) + ladir = pkgconfig_sub2.sub(rb"\g<usrlib>", ladir) if ladir not in libladir: libladir.append(ladir) |