Date: Tue, 16 Sep 2003 00:10:16 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: "Jacques A. Vidrine" <nectar@FreeBSD.org>, Didier Rwitura <drwitura@primustel.ca>, freebsd-current@FreeBSD.org, freebsd-stable@FreeBSD.org Subject: Re: Upgrading to FreeBSD 5.1 Message-ID: <20030915211016.GA22405@sunbay.com> In-Reply-To: <20030915205409.GB47633@madman.celabo.org> References: <003b01c37bbd$7330cfc0$b0120a0a@primus1xqmuzax> <20030915201824.GC14510@sunbay.com> <20030915205409.GB47633@madman.celabo.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--p4qYPpj5QlsIQJ0K
Content-Type: multipart/mixed; boundary="zYM0uCDKw75PZbzx"
Content-Disposition: inline
--zYM0uCDKw75PZbzx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Sep 15, 2003 at 03:54:09PM -0500, Jacques A. Vidrine wrote:
> On Mon, Sep 15, 2003 at 11:18:24PM +0300, Ruslan Ermilov wrote:
> > You mean you upgrade to RELENG_5_1? Beware that this branch
> > is currently not buildable: libpthread build is broken.
>=20
> Eh? By `this branch' you mean RELENG_5_1? How is it broken?
>=20
building shared library libkse.so.1
thr_libc.So: In function `sigaction':
thr_libc.So(.text+0x54): multiple definition of `_sigaction'
thr_sigaction.So(.text+0x0): first defined here
thr_libc.So: In function `sigprocmask':
thr_libc.So(.text+0x34): multiple definition of `_sigprocmask'
thr_sigprocmask.So(.text+0x0): first defined here
*** Error code 1
Basically, see the log for libpthread/support/Makefile.inc,v 1.2
where it talks why -L/usr/lib in a makefile is a Bad Idea (TM).
> If
> there is a problem (I don't know of any --- it built after I made the
> commits for the last security advisory), it is critical to fix it.
>=20
This worked for you because you probably test built RELENG_5_1
on a fresh HEAD system. Please see the attached messages that
is still unanswered that talks about files/revisions involved
into a fix.
Cheers,
--=20
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software Ltd,
ru@FreeBSD.org FreeBSD committer
--zYM0uCDKw75PZbzx
Content-Type: message/rfc822
Content-Disposition: inline
Date: Wed, 3 Sep 2003 10:28:15 +0300
From: Ruslan Ermilov <ru@FreeBSD.org>
To: Alexander Kabaev <kan@FreeBSD.org>
Cc: Jake Burkholder <jake@FreeBSD.org>
Subject: Re: cvs commit: src/lib/libpthread Makefile
src/lib/libpthread/support Makefile.inc
Message-ID: <20030903072815.GA67597@sunbay.com>
References: <200309021937.h82JbBKg098025@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="mP3DRpeJDSE+ciuQ"
Content-Disposition: inline
In-Reply-To: <200309021937.h82JbBKg098025@repoman.freebsd.org>
User-Agent: Mutt/1.5.4i
--mP3DRpeJDSE+ciuQ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Sep 02, 2003 at 12:37:11PM -0700, Alexander Kabaev wrote:
> kan 2003/09/02 12:37:11 PDT
>=20
> FreeBSD src repository
>=20
> Modified files:
> lib/libpthread Makefile=20
> lib/libpthread/support Makefile.inc=20
> Log:
> Rethink the way thr_libc.So is generated. Relying on GCC to extract
> only needed symbols from libc_pic is not working on sparc64.
> =20
> Requested by: jake
> =20
> Revision Changes Path
> 1.48 +0 -6 src/lib/libpthread/Makefile
> 1.6 +32 -4 src/lib/libpthread/support/Makefile.inc
>=20
Excellent! This means that revs. 1.365 and 1.367 to Makefile.inc1 can
go away now?
%%%
Index: Makefile.inc1
=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/Makefile.inc1,v
retrieving revision 1.389
diff -u -r1.389 Makefile.inc1
--- Makefile.inc1 1 Sep 2003 06:43:24 -0000 1.389
+++ Makefile.inc1 3 Sep 2003 07:16:30 -0000
@@ -813,8 +813,6 @@
# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all
# shared libraries for ELF.
#
-# lib/libc (libc_pic.a) must be built before lib/libpthread.
-#
_startup_libs=3D gnu/lib/csu gnu/lib/libgcc
.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
_startup_libs+=3D lib/csu/${MACHINE_ARCH}-elf
@@ -823,6 +821,7 @@
.endif
=20
_prebuild_libs=3D
+
_generic_libs=3D gnu/lib
=20
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
@@ -834,9 +833,6 @@
_generic_libs+=3D kerberos5/lib
.endif
=20
-.if !defined(NOLIBPTHREAD)
-_prebuild_libs+=3D lib/libc
-.endif
_prebuild_libs+=3D lib/libcom_err lib/libcrypt lib/libexpat \
lib/libkvm lib/libmd \
lib/libncurses lib/libopie lib/libpam lib/libradius \
%%%
BTW, the build of RELENG_5_1 is currently broken in libpthread due
to the same issue fixed in these revisions and rev. 1.2 to
libpthread/support/Makefile.inc. Can you please fix the build of
RELENG_5_1 as well?
And, what's so special about Sparc64 that it didn't work there?
Cheers,
--=20
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software Ltd,
ru@FreeBSD.org FreeBSD committer
--mP3DRpeJDSE+ciuQ
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE/VZgPUkv4P6juNwoRAn1oAKCLFhyoVVBWgy1+LsBBE+IM+C782ACcD/g/
fnP/EKcEb40PJX9NW1JCjnY=
=7hdx
-----END PGP SIGNATURE-----
--mP3DRpeJDSE+ciuQ--
--zYM0uCDKw75PZbzx--
--p4qYPpj5QlsIQJ0K
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE/Ziq4Ukv4P6juNwoRAvJ0AJ4x+orHk3OwbLZuKp35Q5a6Dg1+4gCgi3F4
apQea4T3GU/eoc2cKhkQFL8=
=LZV1
-----END PGP SIGNATURE-----
--p4qYPpj5QlsIQJ0K--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030915211016.GA22405>