Re: Upgrading to FreeBSD 5.1

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.
> 
> Eh?  By `this branch' you mean RELENG_5_1?  How is it broken?
> 
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.
> 
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,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru_at_sunbay.com		Sunbay Software Ltd,
ru_at_FreeBSD.org		FreeBSD committer

attached mail follows:

On Tue, Sep 02, 2003 at 12:37:11PM -0700, Alexander Kabaev wrote:
> kan         2003/09/02 12:37:11 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:
>     lib/libpthread       Makefile 
>     lib/libpthread/support Makefile.inc 
>   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.
>   
>   Requested by: jake
>   
>   Revision  Changes    Path
>   1.48      +0 -6      src/lib/libpthread/Makefile
>   1.6       +32 -4     src/lib/libpthread/support/Makefile.inc
> 
Excellent!  This means that revs. 1.365 and 1.367 to Makefile.inc1 can
go away now?

%%%
Index: Makefile.inc1
===================================================================
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
_at__at_ -813,8 +813,6 _at__at_
 # 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=	gnu/lib/csu gnu/lib/libgcc
 .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
 _startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
_at__at_ -823,6 +821,7 _at__at_
 .endif
 
 _prebuild_libs=
+
 _generic_libs=	gnu/lib
 
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
_at__at_ -834,9 +833,6 _at__at_
 _generic_libs+=	kerberos5/lib
 .endif
 
-.if !defined(NOLIBPTHREAD)
-_prebuild_libs+= lib/libc
-.endif
 _prebuild_libs+= 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,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru_at_sunbay.com		Sunbay Software Ltd,
ru_at_FreeBSD.org		FreeBSD committer