Author: emaste
Date: Tue Mar 15 19:26:32 2016
New Revision: 296915
URL: https://svnweb.freebsd.org/changeset/base/296915

Log:
  libc: don't build compat functions if building WITHOUT_SYMVER
  
  WITHOUT_SYMVER necessarily implies building a system without symver
  backwards compatability.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/lib/libc/db/mpool/Makefile.inc
  head/lib/libc/gen/Makefile.inc
  head/lib/libc/iconv/Makefile.inc
  head/lib/libc/posix1e/Makefile.inc
  head/lib/libc/secure/Makefile.inc

Modified: head/lib/libc/db/mpool/Makefile.inc
==============================================================================
--- head/lib/libc/db/mpool/Makefile.inc Tue Mar 15 17:32:29 2016        
(r296914)
+++ head/lib/libc/db/mpool/Makefile.inc Tue Mar 15 19:26:32 2016        
(r296915)
@@ -3,4 +3,7 @@
 
 .PATH: ${LIBC_SRCTOP}/db/mpool
 
-SRCS+= mpool.c mpool-compat.c
+SRCS+= mpool.c
+.if ${MK_SYMVER} == yes
+SRCS+= mpool-compat.c
+.endif

Modified: head/lib/libc/gen/Makefile.inc
==============================================================================
--- head/lib/libc/gen/Makefile.inc      Tue Mar 15 17:32:29 2016        
(r296914)
+++ head/lib/libc/gen/Makefile.inc      Tue Mar 15 19:26:32 2016        
(r296915)
@@ -49,7 +49,6 @@ SRCS+=        __getosreldate.c \
        fstab.c \
        ftok.c \
        fts.c \
-       fts-compat.c \
        ftw.c \
        getbootfile.c \
        getbsize.c \
@@ -137,7 +136,6 @@ SRCS+=      __getosreldate.c \
        ualarm.c \
        ulimit.c \
        uname.c \
-       unvis-compat.c \
        usleep.c \
        utime.c \
        utxdb.c \
@@ -147,6 +145,10 @@ SRCS+=     __getosreldate.c \
        waitpid.c \
        waitid.c \
        wordexp.c
+.if ${MK_SYMVER} == yes
+SRCS+= fts-compat.c \
+       unvis-compat.c
+.endif
 
 .PATH: ${LIBC_SRCTOP}/../../contrib/libc-pwcache
 SRCS+= pwcache.c pwcache.h

Modified: head/lib/libc/iconv/Makefile.inc
==============================================================================
--- head/lib/libc/iconv/Makefile.inc    Tue Mar 15 17:32:29 2016        
(r296914)
+++ head/lib/libc/iconv/Makefile.inc    Tue Mar 15 19:26:32 2016        
(r296915)
@@ -14,7 +14,11 @@ SRCS+=       citrus_bcs.c citrus_bcs_strtol.c 
        citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \
        citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
        citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
-       citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
+       citrus_prop.c citrus_stdenc.c bsd_iconv.c
+.if ${MK_SYMVER} == yes
+SRCS+= iconv_compat.c
+.endif
+
 SYM_MAPS+= ${LIBC_SRCTOP}/iconv/Symbol.map
 
 .if ${MK_ICONV} == yes

Modified: head/lib/libc/posix1e/Makefile.inc
==============================================================================
--- head/lib/libc/posix1e/Makefile.inc  Tue Mar 15 17:32:29 2016        
(r296914)
+++ head/lib/libc/posix1e/Makefile.inc  Tue Mar 15 19:26:32 2016        
(r296915)
@@ -11,7 +11,6 @@ subr_acl_nfs4.c: ${LIBC_SRCTOP}/../../sy
 SRCS+= acl_branding.c                  \
        acl_calc_mask.c                 \
        acl_copy.c                      \
-       acl_compat.c                    \
        acl_delete.c                    \
        acl_delete_entry.c              \
        acl_entry.c                     \
@@ -36,6 +35,9 @@ SRCS+=        acl_branding.c                  \
        mac_get.c                       \
        mac_set.c                       \
        subr_acl_nfs4.c
+.if ${MK_SYMVER} == yes
+SRCS+= acl_compat.c
+.endif
 
 SYM_MAPS+=${LIBC_SRCTOP}/posix1e/Symbol.map
 

Modified: head/lib/libc/secure/Makefile.inc
==============================================================================
--- head/lib/libc/secure/Makefile.inc   Tue Mar 15 17:32:29 2016        
(r296914)
+++ head/lib/libc/secure/Makefile.inc   Tue Mar 15 19:26:32 2016        
(r296915)
@@ -5,8 +5,9 @@
 .PATH: ${LIBC_SRCTOP}/secure
 
 # Sources common to both syscall interfaces:
-SRCS+= \
-       stack_protector.c \
-       stack_protector_compat.c
+SRCS+= stack_protector.c
+.if ${MK_SYMVER} == yes
+SRCS+= stack_protector_compat.c
+.endif
 
 SYM_MAPS+=    ${LIBC_SRCTOP}/secure/Symbol.map
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to