| Message ID | 20160921183642.18428-1-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
> From: "Joe Stringer" <joe@ovn.org> > To: dev@openvswitch.org > Sent: Wednesday, September 21, 2016 2:36:42 PM > Subject: [ovs-dev] [PATCH] travis: Work around glibtoolize error. > > Signed-off-by: Joe Stringer <joe@ovn.org> > --- > .travis/osx-prepare.sh | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh > index cf46d872edfa..611c0709d760 100755 > --- a/.travis/osx-prepare.sh > +++ b/.travis/osx-prepare.sh > @@ -1,3 +1,5 @@ > #!/bin/bash > set -ev > pip install --user six > + > +brew uninstall libtool && brew install libtool || true > -- > 2.9.3 > LGTM, although I wonder what changed in the base image and hope we don't see similar drift in the future... Acked-by: Lance Richardson <lrichard@redhat.com>
On 21 September 2016 at 11:44, Lance Richardson <lrichard@redhat.com> wrote: >> From: "Joe Stringer" <joe@ovn.org> >> To: dev@openvswitch.org >> Sent: Wednesday, September 21, 2016 2:36:42 PM >> Subject: [ovs-dev] [PATCH] travis: Work around glibtoolize error. >> >> Signed-off-by: Joe Stringer <joe@ovn.org> >> --- >> .travis/osx-prepare.sh | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh >> index cf46d872edfa..611c0709d760 100755 >> --- a/.travis/osx-prepare.sh >> +++ b/.travis/osx-prepare.sh >> @@ -1,3 +1,5 @@ >> #!/bin/bash >> set -ev >> pip install --user six >> + >> +brew uninstall libtool && brew install libtool || true >> -- >> 2.9.3 >> > > LGTM, although I wonder what changed in the base image and hope > we don't see similar drift in the future... Looks like it's a migration from macos 10.9->10.11 and upgrade of xcode 6.1->7.3 and maybe some other userland changes. https://blog.travis-ci.com/2016-09-15-new-default-osx-image-coming/ I'll follow up with Travis-CI, but in the mean time this fixes the build so it seems like a good idea. > Acked-by: Lance Richardson <lrichard@redhat.com> Thanks, applied to master and branch-2.6.
On 21 September 2016 at 14:01, Joe Stringer <joe@ovn.org> wrote: > On 21 September 2016 at 11:44, Lance Richardson <lrichard@redhat.com> wrote: >>> From: "Joe Stringer" <joe@ovn.org> >>> To: dev@openvswitch.org >>> Sent: Wednesday, September 21, 2016 2:36:42 PM >>> Subject: [ovs-dev] [PATCH] travis: Work around glibtoolize error. >>> >>> Signed-off-by: Joe Stringer <joe@ovn.org> >>> --- >>> .travis/osx-prepare.sh | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh >>> index cf46d872edfa..611c0709d760 100755 >>> --- a/.travis/osx-prepare.sh >>> +++ b/.travis/osx-prepare.sh >>> @@ -1,3 +1,5 @@ >>> #!/bin/bash >>> set -ev >>> pip install --user six >>> + >>> +brew uninstall libtool && brew install libtool || true >>> -- >>> 2.9.3 >>> >> >> LGTM, although I wonder what changed in the base image and hope >> we don't see similar drift in the future... > > Looks like it's a migration from macos 10.9->10.11 and upgrade of > xcode 6.1->7.3 and maybe some other userland changes. > https://blog.travis-ci.com/2016-09-15-new-default-osx-image-coming/ > > I'll follow up with Travis-CI, but in the mean time this fixes the > build so it seems like a good idea. I received an update from Travis support, and they recommended this approach until they have a chance to fix their osx images.
diff --git a/.travis/osx-prepare.sh b/.travis/osx-prepare.sh index cf46d872edfa..611c0709d760 100755 --- a/.travis/osx-prepare.sh +++ b/.travis/osx-prepare.sh @@ -1,3 +1,5 @@ #!/bin/bash set -ev pip install --user six + +brew uninstall libtool && brew install libtool || true
Signed-off-by: Joe Stringer <joe@ovn.org> --- .travis/osx-prepare.sh | 2 ++ 1 file changed, 2 insertions(+)