summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2006-11-06 00:24:57 +0000
committerkientzle <kientzle@FreeBSD.org>2006-11-06 00:24:57 +0000
commitdce208939678cd175d54e2e26dcbc21442affcd2 (patch)
treeceddb45345aab2031bbfcd516b73bfb580bc3926
parentba33e1d526deda671951a1c68b282475cebdc8d4 (diff)
downloadFreeBSD-src-dce208939678cd175d54e2e26dcbc21442affcd2.zip
FreeBSD-src-dce208939678cd175d54e2e26dcbc21442affcd2.tar.gz
Computing SHLIB_MAJOR is not a good idea. It's really a FreeBSD
system value that has no real relation to the libarchive version. (Except, of course, that any ABI breakage will force both to be incremented.)
-rw-r--r--lib/libarchive/Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index df3612b..98197ab 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -13,12 +13,9 @@ VERSION= 1.2.53
ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/\..*//'
ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[0-9]*\.//' | sed -e 's/\..*//'
-# The FreeBSD SHLIB_MAJOR is computed from the above values.
-# To bump SHLIB_MAJOR, increase the MINOR number in "version" file.
-SHLIB_MAJOR!= echo $$((${ARCHIVE_API_MAJOR} + ${ARCHIVE_API_MINOR}))
-# The SHLIB_MAJOR computation above attempts to match the
-# version number generated by libtool. (This may change
-# when the FreeBSD port of libtool gets fixed.)
+# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
+# It has no real relation to the version number above.
+SHLIB_MAJOR= 3
CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\"
CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\"
OpenPOWER on IntegriCloud