Thanks, I applied this to master and branch-2.1.
On Thu, Jan 09, 2014 at 01:38:04PM -0800, Alex Wang wrote: > Looks good to me, > > > On Tue, Dec 31, 2013 at 2:24 PM, Ben Pfaff <b...@nicira.com> wrote: > > > Libtool is now required as of commit 38b7a52b61 (openvswitch: Use libtool > > and allow building shared libs). > > > > It seems that a build requirement for Python slipped in a while back, for > > generating ovs-vswitchd.conf.db.5, and no one complained, so we might as > > well make it official. (That will let us simplify some bits of the build, > > too, since they won't have to be conditional on Python anymore, so I'm all > > in favor of this change.) > > > > Signed-off-by: Ben Pfaff <b...@nicira.com> > > --- > > v1->v2: Also update INSTALL.RHEL and debian/control. > > > > INSTALL | 4 +++- > > INSTALL.RHEL | 5 +++-- > > debian/control | 2 +- > > 3 files changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/INSTALL b/INSTALL > > index c3693f3..3503151 100644 > > --- a/INSTALL > > +++ b/INSTALL > > @@ -33,6 +33,8 @@ you will need the following software: > > libssl is installed, then Open vSwitch will automatically build > > with support for it. > > > > + - Python 2.x, for x >= 4. > > + > > To compile the kernel module on Linux, you must also install the > > following. If you cannot build or install the kernel module, you may > > use the userspace-only implementation, at a cost in performance. The > > @@ -81,7 +83,7 @@ or the database schema, you will also need the following > > software: > > > > - Automake version 1.10 or later. > > > > - - Python 2.x, for x >= 4. > > + - libtool version 2.4 or later. (Older versions might work too.) > > > > If you modify the ovsdbmonitor tool, then you will also need the > > following: > > diff --git a/INSTALL.RHEL b/INSTALL.RHEL > > index 9ab5384..f46ad98 100644 > > --- a/INSTALL.RHEL > > +++ b/INSTALL.RHEL > > @@ -34,8 +34,9 @@ RHEL. On RHEL 5, the default RPM source directory is > > > > 2. Install build prerequisites: > > > > - yum install gcc make python-devel openssl-devel kernel-devel, graphviz > > \ > > - kernel-debug-devel autoconf automake rpm-build redhat-rpm-config > > + yum install gcc make python-devel openssl-devel kernel-devel graphviz \ > > + kernel-debug-devel autoconf automake rpm-build redhat-rpm-config \ > > + libtool > > > > 3. Some versions of the RHEL 6 kernel-devel package contain a broken > > "build" symlink. If you are using such a version, you must fix > > diff --git a/debian/control b/debian/control > > index 4c439b6..3b5810d 100644 > > --- a/debian/control > > +++ b/debian/control > > @@ -7,7 +7,7 @@ Build-Depends: > > debhelper (>= 8), autoconf (>= 2.64), automake (>= 1.10) | automake1.10, > > libssl-dev, bzip2, openssl, graphviz, > > python-all (>= 2.6.6-3~), procps, python-qt4, > > - python-zopeinterface, python-twisted-conch > > + python-zopeinterface, python-twisted-conch, libtool > > Standards-Version: 3.9.3 > > Homepage: http://openvswitch.org/ > > > > -- > > 1.7.10.4 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
