diff options
author | deischen <deischen@FreeBSD.org> | 2007-05-13 14:12:40 +0000 |
---|---|---|
committer | deischen <deischen@FreeBSD.org> | 2007-05-13 14:12:40 +0000 |
commit | bf3a79274dac1f6f74c4a1d126e3fb098ac9fc6c (patch) | |
tree | cedba41bbd60d21fa5e0f68f5e71c480784553bb /share/mk | |
parent | b8fdd70fefcae4b85366907c61409d531b3ec165 (diff) | |
download | FreeBSD-src-bf3a79274dac1f6f74c4a1d126e3fb098ac9fc6c.zip FreeBSD-src-bf3a79274dac1f6f74c4a1d126e3fb098ac9fc6c.tar.gz |
Enable symbol versioning by default. Use WITHOUT_SYMVER to disable it.
Warning, after symbol versioning is enabled, going back is not easy
(use WITHOUT_SYMVER at your own risk).
Change the default thread library to libthr.
There most likely still needs to be a version bump for at least the
thread libraries. If necessary, this will happen later.
Diffstat (limited to 'share/mk')
-rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.libnames.mk | 6 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 3 | ||||
-rw-r--r-- | share/mk/bsd.symver.mk | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 2c01afc..a2e4f21 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -108,7 +108,7 @@ all: objwarn # Allow librararies to specify their own version map or have it # automatically generated (see bsd.symver.mk above). -.if !empty(VERSION_MAP) +.if (${MK_SYMVER} == "yes") && !empty(VERSION_MAP) ${SHLIB_NAME}: ${VERSION_MAP} LDFLAGS+= -Wl,--version-script=${VERSION_MAP} .endif diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 2eaf9c3..a00d5f8 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -120,7 +120,11 @@ MINUSLPAM+= -lypclnt LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a -LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a +.if defined(DEFAULT_THREAD_LIB) +LIBPTHREAD?= ${DESTDIR}${LIBDIR}/${DEFAULT_THREAD_LIB}.a +.else +LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libthr.a +.endif LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 0b1e9c4..7d4b06e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -162,6 +162,8 @@ NLSOWN?= ${SHAREOWN} NLSGRP?= ${SHAREGRP} NLSMODE?= ${NOBINMODE} +DEFAULT_THREAD_LIB?= libthr + INCLUDEDIR?= /usr/include # Common variables @@ -348,6 +350,7 @@ WITH_IDEA= SENDMAIL \ SETUID_LOGIN \ SHAREDOCS \ + SYMVER \ SYSCONS \ TCSH \ TOOLCHAIN \ diff --git a/share/mk/bsd.symver.mk b/share/mk/bsd.symver.mk index 3debc69..b3cc1d9 100644 --- a/share/mk/bsd.symver.mk +++ b/share/mk/bsd.symver.mk @@ -7,7 +7,7 @@ __<bsd.symver.mk>__: # Generate the version map given the version definitions # and symbol maps. -.if !empty(VERSION_DEF) && !empty(SYMBOL_MAPS) +.if (${MK_SYMVER} == "yes") && !empty(VERSION_DEF) && !empty(SYMBOL_MAPS) # Find the awk script that generates the version map. VERSION_GEN?= version_gen.awk VERSION_MAP?= Version.map |