summaryrefslogtreecommitdiffstats
path: root/lib/atf
diff options
context:
space:
mode:
authorjmmv <jmmv@FreeBSD.org>2014-06-06 17:05:43 +0000
committerjmmv <jmmv@FreeBSD.org>2014-06-06 17:05:43 +0000
commit8ff330c3f483900fdab35f6775ce225242eab0da (patch)
treea4cc9430da7a92ce4ef01f57a275838b00fac51b /lib/atf
parent701aae6977ac7c9ac848e272d0ac1f0541a4131f (diff)
downloadFreeBSD-src-8ff330c3f483900fdab35f6775ce225242eab0da.zip
FreeBSD-src-8ff330c3f483900fdab35f6775ce225242eab0da.tar.gz
Homogenize libatf-* version numbers with upstream.
The libatf-* major version numbers in FreeBSD were one version ahead of upstream because, when atf was first imported into FreeBSD, the upstream numbers were not respected. This is just confusing and bound to cause problems down the road. Fix this by taking advantage of the fact that libatf-* are now private and that atf is not yet built by default. However, and unfortunately, a clean build is needed for tests to continue working once "make delete-old-libs" has been run; hence the note in UPDATING.
Diffstat (limited to 'lib/atf')
-rw-r--r--lib/atf/libatf-c++/Makefile2
-rw-r--r--lib/atf/libatf-c/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index 121b77d..163f7fb 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -30,7 +30,7 @@
LIB= atf-c++
PRIVATELIB= true
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
# libatf-c++ depends on the C version of the ATF library to build.
DPADD= ${LIBATFC}
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index f067ede..4920eb5 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -30,7 +30,7 @@
LIB= atf-c
PRIVATELIB= true
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 0
ATF= ${.CURDIR:H:H:H}/contrib/atf
.PATH: ${ATF}
OpenPOWER on IntegriCloud