Date: Thu, 25 Jul 2002 22:10:18 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: John Baldwin <jhb@FreeBSD.org> Cc: qa@FreeBSD.org, re@FreeBSD.org, "Brian J. McGovern" <bmcgover@cisco.com>, "Bruce A. Mah" <bmah@FreeBSD.org> Subject: Re: Update for 4.6.1 issues Message-ID: <20020725191018.GB62517@sunbay.com> In-Reply-To: <20020725190637.GA62517@sunbay.com> References: <20020725183735.GA57189@sunbay.com> <XFMail.20020725145248.jhb@FreeBSD.org> <20020725190637.GA62517@sunbay.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On Thu, Jul 25, 2002 at 10:06:37PM +0300, Ruslan Ermilov wrote:
> On Thu, Jul 25, 2002 at 02:52:48PM -0400, John Baldwin wrote:
> >
> > On 25-Jul-2002 Ruslan Ermilov wrote:
> > > On Thu, Jul 25, 2002 at 11:27:30AM -0700, Bruce A. Mah wrote:
> > >> If memory serves me right, "Brian J. McGovern" wrote:
> > >> > Is the examples issue a problem with CVS not checking them out? Or is it an
> > >> > issue of the release process not doing the right thing? I can't do the first
> > >> > (no commit privs), but I can look at the second over this coming weekend if
> > >> > we think its a release process issue.
> > >>
> > >> It's a release process problem, I think. I thought that Ruslan (CC-ed)
> > >> committed a fix for this problem to HEAD, but I don't know what the MFC
> > >> status is. Maybe he can shed a little light on this?
> > >>
> > > This was fixed in:
> > >
> > > bsd.subdir.mk,v 1.44 (5.0-CURRENT)
> > > bsd.subdir.mk,v 1.30.2.2 (4.6-STABLE)
> > >
> > > A work-around for RELENG_4_6 (if it's wanted) is to replace the bsd.subdir.mk
> > > by bsd.prog.mk in share/examples/Makefile:
> >
> > How big is the real fix? I personally wouldn't mind the workaround, but if
> > the fix isn't too big I'd rather just do it right to begin with.
> >
> Quite big and not worth the effort IMHO, as it's not security-related.
> Let's don't pollute the security branches with the non-security stuff.
>
Better commit the kludge to RELENG_4_*'s bsd.lib.mk so that ports
affected could still be built on these branches. (This fixes the
bug where the missing LIB= would result in bsd.lib.mk attempting
to build/install lib.a and lib_p.a.)
%%%
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)
iD8DBQE9QE0aUkv4P6juNwoRAlvKAKCKQ2f6NZ/fqtpAh6bljX+o/FgBuACfXMoo
RU8YLfKDM6MgFXUtSCNOgjs=
=gjyO
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020725191018.GB62517>