Date: Mon, 22 Jul 2002 13:04:55 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Kris Kennaway <kris@obsecurity.org> 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> In-Reply-To: <20020722094254.GB11810@xor.obsecurity.org> References: <200207212023.g6LKN09E003348@freefall.freebsd.org> <20020722094254.GB11810@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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
> >
> > Modified files:
> > graphics/gdtclft/files Makefile.bsd
> > graphics/libimg/files Makefile.bsd
> > Log:
> > Catch up to the new bsd.lib.mk API (the library is not internal).
>
> Thanks for fixing the fallout - it's great to see source developers
> doing this!
>
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
===================================================================
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} == elf
-.if !defined(SHLIB_NAME) && defined(SHLIB_MAJOR)
+.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR)
SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR}
-SHLIB_LINK?= lib${LIB}.so
+.endif
+.if defined(SHLIB_NAME)
+.if ${SHLIB_NAME:M*.so.*}
+SHLIB_LINK?= ${SHLIB_NAME:R}
+.endif
.endif
SONAME?= ${SHLIB_NAME}
.else
@@ -154,7 +158,7 @@
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}
-.if !defined(INTERNALLIB) || defined(INTERNALSTATICLIB)
+.if (!defined(INTERNALLIB) || defined(INTERNALSTATICLIB)) && defined(LIB)
.if !defined(NOPROFILE) && !defined(INTERNALLIB)
_LIBS=lib${LIB}.a lib${LIB}_p.a
.else
@@ -290,12 +294,14 @@
.endfor
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,
--
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
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQE9O9jHUkv4P6juNwoRAhqNAJ9yw4OCVx+tPQHjK7J9i9/A5p+HhgCbBojE
AbTJqRcq0DAWcwKvIgTrbY4=
=AtuU
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020722100455.GB32796>