Hello, all.

This patch makes libtool skip "-bindir path" args, and this is
actually intended behaviour, see the Libtool manual:

https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html

This allows to drop two patches in print/texlive/base. Maybe some
ports could be now switched from GNU libtool to ours as well...

Okay to put this in?
--
WBR,
  Vadim Zhukov


Index: Link.pm
===================================================================
RCS file: /cvs/src/usr.bin/libtool/LT/Mode/Link.pm,v
retrieving revision 1.33
diff -u -p -r1.33 Link.pm
--- Link.pm     3 Nov 2016 10:23:01 -0000       1.33
+++ Link.pm     17 Dec 2016 21:15:39 -0000
@@ -699,10 +699,13 @@ sub parse_linkargs2
        tsay {"parse_linkargs2"};
        tsay {"  args: @{$self->{args}}"};
        my $result = [];
+       my $skipnext = 0;
 
        foreach my $arg (@{$self->{args}}) {
                tsay {"  processing $arg"};
-               if (!$arg || $arg eq '' || $arg =~ m/^\s+$/) {
+               if ($skipnext) {
+                       $skipnext = 0;
+               } elsif (!$arg || $arg eq '' || $arg =~ m/^\s+$/) {
                        # skip empty arguments
                } elsif ($arg eq '-lc') {
                        # don't link explicitly with libc (just remove -lc)
@@ -753,6 +756,9 @@ sub parse_linkargs2
                        foreach my $f (@Wlflags) {
                                push(@$result, "-Wl,$f");
                        }
+               } elsif ($arg eq '-bindir') {
+                       # should be ignored on OpenBSD
+                       $skipnext = 1;
                } else {
                        push(@$result, $arg);
                }

Reply via email to