From owner-cvs-src@FreeBSD.ORG Sun Jul 3 01:03:32 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFF3016A7D8; Sun, 3 Jul 2005 00:57:25 +0000 (GMT) (envelope-from ps@mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00112441A9; Sun, 3 Jul 2005 00:39:03 +0000 (GMT) (envelope-from ps@mu.org) Received: by elvis.mu.org (Postfix, from userid 1000) id 033E46D9C3; Sat, 2 Jul 2005 17:37:41 -0700 (PDT) X-Original-To: ps@mu.org Delivered-To: ps@mu.org Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by elvis.mu.org (Postfix) with ESMTP id C87A35C9CC for ; Tue, 18 Jan 2005 01:34:33 -0800 (PST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 7E4035620F for ; Tue, 18 Jan 2005 09:34:33 +0000 (GMT) (envelope-from owner-src-committers@FreeBSD.org) Received: by hub.freebsd.org (Postfix) id 3DEB316A54E; Tue, 18 Jan 2005 09:34:23 +0000 (GMT) Delivered-To: ps@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id 6948E16A4CF; Tue, 18 Jan 2005 09:34:20 +0000 (GMT) Delivered-To: src-committers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DC4C16A4D0 for ; Tue, 18 Jan 2005 09:34:19 +0000 (GMT) Received: from gandalf.online.bg (gandalf.online.bg [217.75.128.9]) by mx1.FreeBSD.org (Postfix) with SMTP id 8F6B243D1F for ; Tue, 18 Jan 2005 09:34:17 +0000 (GMT) (envelope-from roam@straylight.ringlet.net) Received: (qmail 8658 invoked from network); 18 Jan 2005 09:34:13 -0000 Received: from unknown (HELO straylight.ringlet.net) (213.16.36.109) by gandalf.online.bg with SMTP; 18 Jan 2005 09:34:13 -0000 Received: (qmail 36044 invoked by uid 1000); 18 Jan 2005 09:34:15 -0000 From: Peter Pentchev To: Robert Watson Message-ID: <20050118093415.GB2222@straylight.m.ringlet.net> Mail-Followup-To: Robert Watson , src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org References: <20050117211120.CB5FC16A4CF@hub.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3lcZGd9BuhuYXNfi" Content-Disposition: inline In-Reply-To: <200501171735.j0HHZcUL070254@repoman.freebsd.org> User-Agent: Mutt/1.5.6i Sender: owner-src-committers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Spam-Checker-Version: SpamAssassin 3.0.1 (2004-10-22) on elvis.mu.org X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, UPPERCASE_25_50 autolearn=no version=3.0.1 X-Spam-Level: Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/kerberos5/libexec/hprop Makefile X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 03 Jul 2005 01:03:32 -0000 X-Original-Date: Tue, 18 Jan 2005 11:34:15 +0200 X-List-Received-Date: Sun, 03 Jul 2005 01:03:32 -0000 --3lcZGd9BuhuYXNfi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 17, 2005 at 05:35:38PM +0000, Robert Watson wrote: > rwatson 2005-01-17 17:35:38 UTC >=20 > FreeBSD src repository >=20 > Modified files: (Branch: RELENG_4) > kerberos5/libexec/hprop Makefile=20 > Log: > When building hprop, add ${KRB5DIR}/lib to the include path, as the > mit_dump.c expects to be able to include krb5/admin.h. > =20 > Revision Changes Path > 1.3.2.4 +1 -0 src/kerberos5/libexec/hprop/Makefile This seems to have broken my krb4-less build, since libkafs5 is only built with Kerberos 4 according to src/kerberos5/lib/Makefile. Here's a patch that moves the kafs5 library within the MAKE_KERBEROS4 conditional, and it seems to work for me. I could commit it if it looks correct to you. G'luck, Peter Index: src/kerberos5/libexec/hprop/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/kerberos5/libexec/hprop/Makefile,v retrieving revision 1.3.2.4 diff -u -r1.3.2.4 Makefile --- src/kerberos5/libexec/hprop/Makefile 17 Jan 2005 17:35:38 -0000 1.3.2.4 +++ src/kerberos5/libexec/hprop/Makefile 18 Jan 2005 09:32:53 -0000 @@ -14,15 +14,15 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} .if defined(MAKE_KERBEROS4) -_krb4libs=3D -lkrb -lkafs -lkdb -_krb4deps=3D ${LIBKRB} ${LIBKAFS} ${LIBKDB} +_krb4libs=3D -lkrb -lkafs -lkdb -L${KAFS5OBJDIR} -lkafs5 +_krb4deps=3D ${LIBKRB} ${LIBKAFS} ${LIBKDB} ${LIBKAFS5} .endif -LDADD=3D -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ +LDADD=3D -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD=3D ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ +DPADD=3D ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN=3D hprop.8 =20 --=20 Peter Pentchev roam@ringlet.net roam@cnsys.bg roam@FreeBSD.org PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 What would this sentence be like if pi were 3? --3lcZGd9BuhuYXNfi Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFB7NgX7Ri2jRYZRVMRAqiiAJ46QoOF1JB01Bv6k2pKSg+hWZHUAgCgxvSq CJqlhPf/BeJEpmohx2GV/BU= =GLnK -----END PGP SIGNATURE----- --3lcZGd9BuhuYXNfi--