From owner-freebsd-current Mon Apr 8 7: 5: 2 2002 Delivered-To: freebsd-current@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 1EDE137B417; Mon, 8 Apr 2002 07:04:46 -0700 (PDT) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id g38E4YW01835; Mon, 8 Apr 2002 17:04:34 +0300 (EEST) (envelope-from ru) Date: Mon, 8 Apr 2002 17:04:34 +0300 From: Ruslan Ermilov To: Dag-Erling Smorgrav , Mark Murray Cc: current@FreeBSD.org Subject: Re: cvs commit: src/lib/libpam/modules/pam_unix pam_unix.c Message-ID: <20020408140434.GA94938@sunbay.com> References: <200204072043.g37KhRi76699@freefall.freebsd.org> <20020408101138.GA68318@sunbay.com> <20020408110123.GB68318@sunbay.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nFreZHaLTZJo0R7j" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 08, 2002 at 02:49:04PM +0200, Dag-Erling Smorgrav wrote: > Ruslan Ermilov writes: > > You're right. I forgot to relink pam_ssh.so library, and the diff was > > against the wrong revision. I will still commit the "const poisoning" > > patch to libutil, as the impact turned out to be really low. >=20 > Thanks, const poisoning is a Good Thing [tm]. >=20 > BTW, could you try to figure out a way we can split up the libpam > build so the modules can depend on libpam.so? What I'd like is: >=20 > 1) build static modules > 2) build static and dynamic libpam > 3) build dynamic modules (with dependency on libpam.so) >=20 > or >=20 > 1) build dynamic libpam > 2) build modules (with dependency on libpam.so) > 3) build static libpam >=20 > or something similar. >=20 That should be as simple as that: %%% Index: Makefile.inc =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/lib/libpam/modules/Makefile.inc,v retrieving revision 1.10 diff -u -r1.10 Makefile.inc --- Makefile.inc 6 Apr 2002 19:32:37 -0000 1.10 +++ Makefile.inc 8 Apr 2002 14:03:39 -0000 @@ -9,11 +9,7 @@ CFLAGS+=3D -I${.CURDIR}/../../libpam WARNS?=3D 4 =20 -# This is nasty. -# For the static case, libpam.a depends on the modules. -# For the dynamic case, the modules depend on libpam.so.N -# Punt for the time being until I can figure out how to do it. -#DPADD+=3D ${LIBPAM} -#LDADD+=3D -lpam +# Break `checkdpadd' deliberately. +LDADD+=3D -lpam =20 .include "../Makefile.inc" %%% For the static case (Mark probably means building of libpam.a here), libpam.a indeed depends on the modules, but in the make(1) sense of dependency, which we (sorry, _you_ Mark :-) handle nicely with the STATIC_MODULES thingie. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --nFreZHaLTZJo0R7j Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE8saNyUkv4P6juNwoRAgPeAJ0feB5zylwc42YULtkgdaqL4/fAHACfbc9M wHQ7VC2Saq5/Tqboql9bEUY= =8O7u -----END PGP SIGNATURE----- --nFreZHaLTZJo0R7j-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message