diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-04-16 17:46:49 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-04-24 05:22:03 -0700 |
| commit | 4973d0ea608147ff186f13ab51090f59986f1c9f (patch) | |
| tree | 1fae7a5209fcbdf2c596d239f302716bd4219ecf | |
| parent | ec6ccda3783e9a3edd5a2e4093e07ee37f266520 (diff) | |
build: correct the version in glusterfs-api.pc
The version in glusterfs-api.pc has moved backwards, breaking existing
versioned dependencies in QEMU. The following table contains the
GlusterFS version and the version for glusterfs-api.pc:
.------------------------.
| GlusterFS | pkg-config |
|-----------+------------|
| 3.4.x | 4.3.4.x |
| 3.5.x | 6.3.5.x |
| 3.6.x | 7.3.6.x |
| 3.7.x | 7.3.7.x |
| master | 7.x.y.z |
'------------------------'
BUG: 1211836
Change-Id: I62168a0ab4f0c78e61987371ae75a0d2dd56ced8
URL: http://thread.gmane.org/gmane.comp.emulators.qemu/330176
Reported-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10308
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 608d267a5a8..c16695e735f 100644 --- a/configure.ac +++ b/configure.ac @@ -1269,15 +1269,15 @@ AC_SUBST(GLUSTERFSD_MISCDIR) dnl pkg-config versioning dnl -dnl Once we released gluster-api.pc with version=4. Since then we undid the +dnl Once we released gluster-api.pc with version=7. Since then we undid the dnl library versioning and replaced it with symbol-versioning. The current dnl libgfapi.so has version 0, but the symbols have the version from the main dnl package at the time they were added. dnl dnl Because other packages (like samba) use the pkg-config version, we can not dnl drop it, or decrease the version easily. The simplest solution is to keep -dnl the version=4 and add sub-digits for the actual package/symbol versions. -GFAPI_VERSION="4."${PACKAGE_VERSION} +dnl the version=7 and add sub-digits for the actual package/symbol versions. +GFAPI_VERSION="7."${PACKAGE_VERSION} LIBGFCHANGELOG_VERSION="0.0.1" AC_SUBST(GFAPI_VERSION) AC_SUBST(LIBGFCHANGELOG_VERSION) |