[Midnightbsd-cvs] src [10421] update makefile and version definitions
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 5 18:04:38 EDT 2018
Revision: 10421
http://svnweb.midnightbsd.org/src/?rev=10421
Author: laffer1
Date: 2018-06-05 18:04:37 -0400 (Tue, 05 Jun 2018)
Log Message:
-----------
update makefile and version definitions
Modified Paths:
--------------
trunk/lib/libc/Makefile
trunk/lib/libc/Versions.def
Property Changed:
----------------
trunk/lib/libc/Versions.def
Modified: trunk/lib/libc/Makefile
===================================================================
--- trunk/lib/libc/Makefile 2018-06-05 21:54:18 UTC (rev 10420)
+++ trunk/lib/libc/Makefile 2018-06-05 22:04:37 UTC (rev 10421)
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
+# $FreeBSD: stable/10/lib/libc/Makefile 282854 2015-05-13 11:32:55Z ngie $
# $MidnightBSD$
SHLIBDIR?= /lib
@@ -18,7 +18,7 @@
# All library objects contain MidnightBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
-# not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
+# not contain these strings, add -DSTRIP_MBSDID (see <sys/cdefs.h>) to CFLAGS
# below. Note: there are no IDs for syscall stubs whose sources are generated.
# To include legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
# to CFLAGS below. -DSYSLIBC_SCCS affects just the system call stubs.
@@ -48,6 +48,7 @@
LDADD+= -lgcc
.if ${MK_SSP} != "no"
+DPADD+= ${LIBSSP_NONSHARED}
LDADD+= -lssp_nonshared
.endif
@@ -74,12 +75,18 @@
.include "${.CURDIR}/inet/Makefile.inc"
.include "${.CURDIR}/isc/Makefile.inc"
.include "${.CURDIR}/locale/Makefile.inc"
+.include "${.CURDIR}/md/Makefile.inc"
.include "${.CURDIR}/nameser/Makefile.inc"
.include "${.CURDIR}/net/Makefile.inc"
.include "${.CURDIR}/nls/Makefile.inc"
.include "${.CURDIR}/ohash/Makefile.inc"
.include "${.CURDIR}/posix1e/Makefile.inc"
-.if ${LIBC_ARCH} != "amd64"
+.if ${LIBC_ARCH} != "amd64" && \
+ ${LIBC_ARCH} != "ia64" && \
+ ${LIBC_ARCH} != "powerpc64" && \
+ ${LIBC_ARCH} != "sparc64" && \
+ ${MACHINE_ARCH:Mmipsn32*} == "" && \
+ ${MACHINE_ARCH:Mmips64*} == ""
.include "${.CURDIR}/quad/Makefile.inc"
.endif
.include "${.CURDIR}/regex/Makefile.inc"
@@ -86,6 +93,7 @@
.include "${.CURDIR}/resolv/Makefile.inc"
.include "${.CURDIR}/stdio/Makefile.inc"
.include "${.CURDIR}/stdlib/Makefile.inc"
+.include "${.CURDIR}/stdlib/jemalloc/Makefile.inc"
.include "${.CURDIR}/stdtime/Makefile.inc"
.include "${.CURDIR}/string/Makefile.inc"
.include "${.CURDIR}/sys/Makefile.inc"
@@ -92,10 +100,14 @@
.include "${.CURDIR}/rpc/Makefile.inc"
.include "${.CURDIR}/uuid/Makefile.inc"
.include "${.CURDIR}/xdr/Makefile.inc"
+.if ${LIBC_ARCH} == "arm" || ${LIBC_ARCH} == "mips"
+.include "${.CURDIR}/softfloat/Makefile.inc"
+.endif
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
.include "${.CURDIR}/yp/Makefile.inc"
.endif
+.include "${.CURDIR}/capability/Makefile.inc"
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
@@ -133,8 +145,8 @@
KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
-KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c index.c mcount.c rindex.c \
- strcat.c strcmp.c strcpy.c strlen.c strncpy.c
+KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c mcount.c strcat.c strchr.c \
+ strcmp.c strcpy.c strlen.c strncpy.c strrchr.c
libkern: libkern.gen libkern.${LIBC_ARCH}
@@ -146,6 +158,14 @@
cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
.endif
+.if !defined(WITHOUT_SYSCALL_COMPAT)
+CFLAGS+=-DSYSCALL_COMPAT
+.endif
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.lib.mk>
# Disable warnings in contributed sources.
Modified: trunk/lib/libc/Versions.def
===================================================================
--- trunk/lib/libc/Versions.def 2018-06-05 21:54:18 UTC (rev 10420)
+++ trunk/lib/libc/Versions.def 2018-06-05 22:04:37 UTC (rev 10421)
@@ -1,13 +1,14 @@
-# $MidnightBSD: src/lib/libc/Versions.def,v 1.7 2012/04/01 01:42:33 laffer1 Exp $
+# $MidnightBSD$
# This is our first version; it depends on no other. It is from FreeBSD 7
FBSD_1.0 {
};
-# This version is from FreeBSD 7.0-stable just before 7.1.
+# This version was first added to FreeBSD 8.0-current.
FBSD_1.1 {
} FBSD_1.0;
+# This version was first added to FreeBSD 9.0-current.
FBSD_1.2 {
} FBSD_1.1;
@@ -15,6 +16,14 @@
FBSD_1.3 {
} FBSD_1.2;
+# This version was first added to FreeBSD 11.0-current.
+FBSD_1.4 {
+} MNBSD_1.2;
+
+# This version was first added to FreeBSD 12.0-current.
+FBSD_1.5 {
+} FBSD_1.4;
+
# This version was first added to MidnightBSD 0.3-current.
MNBSD_1.0 {
} FBSD_1.3;
@@ -26,9 +35,13 @@
MNBSD_1.2 {
} MNBSD_1.1;
+# This version was first added to MiidnightBSD 1.0-current.
+MNBSD_1.3 {
+} FBSD_1.5;
+
# This is our private namespace. Any global interfaces that are
# strictly for use only by other FreeBSD applications and libraries
# are listed here. We use a separate namespace so we can write
# simple ABI-checking tools.
FBSDprivate_1.0 {
-} MNBSD_1.2;
+} MNBSD_1.3;
Property changes on: trunk/lib/libc/Versions.def
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list