svn commit: r332124 - in projects/krb5/kerberos5/lib: libhdb libheimntlm libkadm5clnt libkadm5srv libkrb5

[Cy Schubert]

Author: cy
Date: Fri Apr  6 18:16:14 2018
New Revision: 332124
URL: https://svnweb.freebsd.org/changeset/base/332124

Log:
  Resolve the following link error with mips.mips64elhf and
  mips.mips64el.
  
  --- libprivatekrb5.so.11.full ---
  mips.mips64elhf/obj-lib32/tmp/usr/lib32/libprivateasn1.so:
  could not read symbols: File in wrong format
  
  This was an early amd64 workaround that was not fully removed when r323334
  was committed to this branch.

Modified:
  projects/krb5/kerberos5/lib/libhdb/Makefile
  projects/krb5/kerberos5/lib/libheimntlm/Makefile
  projects/krb5/kerberos5/lib/libkadm5clnt/Makefile
  projects/krb5/kerberos5/lib/libkadm5srv/Makefile
  projects/krb5/kerberos5/lib/libkrb5/Makefile

Modified: projects/krb5/kerberos5/lib/libhdb/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libhdb/Makefile	Fri Apr  6 18:10:38 2018	(r332123)
+++ projects/krb5/kerberos5/lib/libhdb/Makefile	Fri Apr  6 18:16:14 2018	(r332124)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include "../Makefile.inc"
-
 LIB=	hdb
 PRIVATELIB=	true
 LDFLAGS=	-Wl,--no-undefined ${LDAPLDFLAGS}

Modified: projects/krb5/kerberos5/lib/libheimntlm/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libheimntlm/Makefile	Fri Apr  6 18:10:38 2018	(r332123)
+++ projects/krb5/kerberos5/lib/libheimntlm/Makefile	Fri Apr  6 18:16:14 2018	(r332124)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include "../Makefile.inc"
-
 LIB=	heimntlm
 PRIVATELIB=	true
 LDFLAGS=	-Wl,--no-undefined

Modified: projects/krb5/kerberos5/lib/libkadm5clnt/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libkadm5clnt/Makefile	Fri Apr  6 18:10:38 2018	(r332123)
+++ projects/krb5/kerberos5/lib/libkadm5clnt/Makefile	Fri Apr  6 18:16:14 2018	(r332124)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include "../Makefile.inc"
-
 LIB=	kadm5clnt
 PRIVATELIB=	true
 LDFLAGS=	-Wl,--no-undefined

Modified: projects/krb5/kerberos5/lib/libkadm5srv/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libkadm5srv/Makefile	Fri Apr  6 18:10:38 2018	(r332123)
+++ projects/krb5/kerberos5/lib/libkadm5srv/Makefile	Fri Apr  6 18:16:14 2018	(r332124)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include "../Makefile.inc"
-
 LIB=	kadm5srv
 PRIVATELIB=	true
 LDFLAGS=	-Wl,--no-undefined

Modified: projects/krb5/kerberos5/lib/libkrb5/Makefile
==============================================================================
--- projects/krb5/kerberos5/lib/libkrb5/Makefile	Fri Apr  6 18:10:38 2018	(r332123)
+++ projects/krb5/kerberos5/lib/libkrb5/Makefile	Fri Apr  6 18:16:14 2018	(r332124)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include "../Makefile.inc"
-
 LIB=	krb5
 PRIVATELIB=	true
 LDFLAGS=	-Wl,--no-undefined