Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/pgoyette-compat]: src/sys/conf No longer build the libcompat.o which end...



details:   https://anonhg.NetBSD.org/src/rev/e5e1f11a9c37
branches:  pgoyette-compat
changeset: 320948:e5e1f11a9c37
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Mar 06 05:40:32 2018 +0000

description:
No longer build the libcompat.o which ends up including most of the
compat_netbsd code without creating the module entry that other
modules are depending on, which in turn causes the modules to fail
to load because of redefined symbols.

diffstat:

 sys/conf/Makefile.kern.inc |  16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)

diffs (44 lines):

diff -r 5c1e5969c079 -r e5e1f11a9c37 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Tue Mar 06 05:38:20 2018 +0000
+++ b/sys/conf/Makefile.kern.inc        Tue Mar 06 05:40:32 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.264 2018/02/17 22:47:14 joerg Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.264.2.1 2018/03/06 05:40:32 pgoyette Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -155,7 +155,7 @@
                ${KLINK.o}
 
 ##
-## (3) libkern and compat
+## (3) libkern
 ##
 ## Set KERN_AS in the port Makefile to "obj" or "library".  The
 ## default is "library", as documented in $S/lib/libkern/Makefile.inc.
@@ -171,16 +171,6 @@
 
 LIBKERNLN?=    ${KERNLIBLN}
 
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-SYSLIBCOMPAT?= ${COMPATLIB}
-.else
-SYSLIBCOMPAT?= ${COMPATLIB_PROF}
-.endif
-
-SYSLIBCOMPATLN?=       ${COMPATLIBLN}
-
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
@@ -205,7 +195,7 @@
 # load lines for config "xxx" will be emitted as:
 # xxx: ${SYSTEM_DEP} swapxxxx.o vers.o build_kernel
 
-SYSTEM_LIB=    ${MD_LIBS} ${SYSLIBCOMPAT} ${LIBKERN}
+SYSTEM_LIB=    ${MD_LIBS} ${LIBKERN}
 SYSTEM_OBJ?=   ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB}
 SYSTEM_DEP+=   Makefile ${SYSTEM_OBJ:O}
 .if defined(CTFMERGE)



Home | Main Index | Thread Index | Old Index