From owner-cvs-all Mon Jul 22 3: 5:28 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 97DDD37B400; Mon, 22 Jul 2002 03:05:14 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EA8E43E3B; Mon, 22 Jul 2002 03:05:08 -0700 (PDT) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.6/8.11.2) id g6MA4tH36375; Mon, 22 Jul 2002 13:04:55 +0300 (EEST) (envelope-from ru) Date: Mon, 22 Jul 2002 13:04:55 +0300 From: Ruslan Ermilov To: Kris Kennaway Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: ports/graphics/gdtclft/files Makefile.bsd ports/graphics/libimg/files Makefile.bsd Message-ID: <20020722100455.GB32796@sunbay.com> References: <200207212023.g6LKN09E003348@freefall.freebsd.org> <20020722094254.GB11810@xor.obsecurity.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8GpibOaaTibBMecb" Content-Disposition: inline In-Reply-To: <20020722094254.GB11810@xor.obsecurity.org> User-Agent: Mutt/1.3.99i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --8GpibOaaTibBMecb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jul 22, 2002 at 02:42:54AM -0700, Kris Kennaway wrote: > On Sun, Jul 21, 2002 at 01:23:00PM -0700, Ruslan Ermilov wrote: > > ru 2002/07/21 13:23:00 PDT > >=20 > > Modified files: > > graphics/gdtclft/files Makefile.bsd=20 > > graphics/libimg/files Makefile.bsd=20 > > Log: > > Catch up to the new bsd.lib.mk API (the library is not internal). >=20 > Thanks for fixing the fallout - it's great to see source developers > doing this! >=20 It's because I'm going to MFC bsd.incs.mk today and bsd.lib.mk was already merged. I did not fix ports that have bsd.lib.mk makefiles in their distributions. Also, the "catch up to the new bsd.lib.mk API" fixes make the relevant ports build/install garbage, because of the changed meaning of INTERNALLIB knob. As a good compromise, I could commit the minimalistic patch for RELENG_4_*'s bsd.lib.mk so that it does not exhibit the "empty LIB" bug (bsd.lib.mk attemps to build static and profiles libraries even if LIB is undefined), thus making these ports compile on RELENG_4_* security branches. This one is for RELENG_4_5: %%% Index: bsd.lib.mk =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/share/mk/bsd.lib.mk,v retrieving revision 1.91.2.4 diff -u -r1.91.2.4 bsd.lib.mk --- bsd.lib.mk 24 Sep 2001 15:44:22 -0000 1.91.2.4 +++ bsd.lib.mk 22 Jul 2002 10:02:39 -0000 @@ -25,9 +25,13 @@ .undef INSTALL_PIC_ARCHIVE .else .if ${OBJFORMAT} =3D=3D elf -.if !defined(SHLIB_NAME) && defined(SHLIB_MAJOR) +.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR) SHLIB_NAME=3D lib${LIB}.so.${SHLIB_MAJOR} -SHLIB_LINK?=3D lib${LIB}.so +.endif +.if defined(SHLIB_NAME) +.if ${SHLIB_NAME:M*.so.*} +SHLIB_LINK?=3D ${SHLIB_NAME:R} +.endif .endif SONAME?=3D ${SHLIB_NAME} .else @@ -154,7 +158,7 @@ @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} =20 -.if !defined(INTERNALLIB) || defined(INTERNALSTATICLIB) +.if (!defined(INTERNALLIB) || defined(INTERNALSTATICLIB)) && defined(LIB) .if !defined(NOPROFILE) && !defined(INTERNALLIB) _LIBS=3Dlib${LIB}.a lib${LIB}_p.a .else @@ -290,12 +294,14 @@ .endfor =20 realinstall: beforeinstall +.if defined(LIB) .if !defined(INTERNALLIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .if !defined(NOPROFILE) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} +.endif .endif .endif .if defined(SHLIB_NAME) %%% 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 --8GpibOaaTibBMecb Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iD8DBQE9O9jHUkv4P6juNwoRAhqNAJ9yw4OCVx+tPQHjK7J9i9/A5p+HhgCbBojE AbTJqRcq0DAWcwKvIgTrbY4= =AtuU -----END PGP SIGNATURE----- --8GpibOaaTibBMecb-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message