| Message ID | 1459233497-29983-1-git-send-email-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 64d827e4ed96c9e3e7d4780fae299b6409a8f98e |
| Headers | show |
On Tue, Mar 29, 2016 at 3:38 AM, Anders Roxell <anders.roxell@linaro.org> wrote: > pkgconfig version string to follow the main odp version, instead of the > git snapshot string since pkg-config/lib consumers are concerned with > the real upstream version. > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > configure.ac | 2 ++ > pkgconfig/libodp-linux.pc.in | 2 +- > pkgconfig/libodphelper-linux.pc.in | 2 +- > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index f443ce4..3cb5f1e 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -66,6 +66,8 @@ AC_SUBST([ARCH]) > AGE=0 > ODP_LIBSO_VERSION=$(echo $VERSION.$AGE | awk -F . '{printf("%d:%d:%d\n", (($1 * 100) + $2), $3, $4)}') > AC_SUBST(ODP_LIBSO_VERSION) > +PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') > +AC_SUBST(PKGCONFIG_VERSION) > > ########################################################################## > # Determine which platform to build for > diff --git a/pkgconfig/libodp-linux.pc.in b/pkgconfig/libodp-linux.pc.in > index 946f11f..0769b21 100644 > --- a/pkgconfig/libodp-linux.pc.in > +++ b/pkgconfig/libodp-linux.pc.in > @@ -5,7 +5,7 @@ includedir=@includedir@ > > Name: libodp-linux > Description: The ODP packet processing engine > -Version: @VERSION@ > +Version: @PKGCONFIG_VERSION@ > Libs: -L${libdir} -lodp-linux > Libs.private: > Cflags: -I${includedir} > diff --git a/pkgconfig/libodphelper-linux.pc.in b/pkgconfig/libodphelper-linux.pc.in > index 71c7d5d..3987f4c 100644 > --- a/pkgconfig/libodphelper-linux.pc.in > +++ b/pkgconfig/libodphelper-linux.pc.in > @@ -5,7 +5,7 @@ includedir=@includedir@ > > Name: libodphelper-linux > Description: Helper for the ODP packet processing engine > -Version: @VERSION@ > +Version: @PKGCONFIG_VERSION@ > Libs: -L${libdir} -lodphelper-linux > Libs.private: > Cflags: -I${includedir} > -- > 2.1.4 Tested-and-reviewed-by: Ricardo Salveti <ricardo.salveti@linaro.org>
Merged, Maxim. On 03/30/16 22:13, Ricardo Salveti wrote: > On Tue, Mar 29, 2016 at 3:38 AM, Anders Roxell <anders.roxell@linaro.org> wrote: >> pkgconfig version string to follow the main odp version, instead of the >> git snapshot string since pkg-config/lib consumers are concerned with >> the real upstream version. >> >> Signed-off-by: Anders Roxell <anders.roxell@linaro.org> >> --- >> configure.ac | 2 ++ >> pkgconfig/libodp-linux.pc.in | 2 +- >> pkgconfig/libodphelper-linux.pc.in | 2 +- >> 3 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/configure.ac b/configure.ac >> index f443ce4..3cb5f1e 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -66,6 +66,8 @@ AC_SUBST([ARCH]) >> AGE=0 >> ODP_LIBSO_VERSION=$(echo $VERSION.$AGE | awk -F . '{printf("%d:%d:%d\n", (($1 * 100) + $2), $3, $4)}') >> AC_SUBST(ODP_LIBSO_VERSION) >> +PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') >> +AC_SUBST(PKGCONFIG_VERSION) >> >> ########################################################################## >> # Determine which platform to build for >> diff --git a/pkgconfig/libodp-linux.pc.in b/pkgconfig/libodp-linux.pc.in >> index 946f11f..0769b21 100644 >> --- a/pkgconfig/libodp-linux.pc.in >> +++ b/pkgconfig/libodp-linux.pc.in >> @@ -5,7 +5,7 @@ includedir=@includedir@ >> >> Name: libodp-linux >> Description: The ODP packet processing engine >> -Version: @VERSION@ >> +Version: @PKGCONFIG_VERSION@ >> Libs: -L${libdir} -lodp-linux >> Libs.private: >> Cflags: -I${includedir} >> diff --git a/pkgconfig/libodphelper-linux.pc.in b/pkgconfig/libodphelper-linux.pc.in >> index 71c7d5d..3987f4c 100644 >> --- a/pkgconfig/libodphelper-linux.pc.in >> +++ b/pkgconfig/libodphelper-linux.pc.in >> @@ -5,7 +5,7 @@ includedir=@includedir@ >> >> Name: libodphelper-linux >> Description: Helper for the ODP packet processing engine >> -Version: @VERSION@ >> +Version: @PKGCONFIG_VERSION@ >> Libs: -L${libdir} -lodphelper-linux >> Libs.private: >> Cflags: -I${includedir} >> -- >> 2.1.4 > Tested-and-reviewed-by: Ricardo Salveti <ricardo.salveti@linaro.org> >
diff --git a/configure.ac b/configure.ac index f443ce4..3cb5f1e 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,8 @@ AC_SUBST([ARCH]) AGE=0 ODP_LIBSO_VERSION=$(echo $VERSION.$AGE | awk -F . '{printf("%d:%d:%d\n", (($1 * 100) + $2), $3, $4)}') AC_SUBST(ODP_LIBSO_VERSION) +PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') +AC_SUBST(PKGCONFIG_VERSION) ########################################################################## # Determine which platform to build for diff --git a/pkgconfig/libodp-linux.pc.in b/pkgconfig/libodp-linux.pc.in index 946f11f..0769b21 100644 --- a/pkgconfig/libodp-linux.pc.in +++ b/pkgconfig/libodp-linux.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libodp-linux Description: The ODP packet processing engine -Version: @VERSION@ +Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lodp-linux Libs.private: Cflags: -I${includedir} diff --git a/pkgconfig/libodphelper-linux.pc.in b/pkgconfig/libodphelper-linux.pc.in index 71c7d5d..3987f4c 100644 --- a/pkgconfig/libodphelper-linux.pc.in +++ b/pkgconfig/libodphelper-linux.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libodphelper-linux Description: Helper for the ODP packet processing engine -Version: @VERSION@ +Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lodphelper-linux Libs.private: Cflags: -I${includedir}
pkgconfig version string to follow the main odp version, instead of the git snapshot string since pkg-config/lib consumers are concerned with the real upstream version. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- configure.ac | 2 ++ pkgconfig/libodp-linux.pc.in | 2 +- pkgconfig/libodphelper-linux.pc.in | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)