Date: Thu, 26 May 2005 13:59:15 -0700 From: Vizion <vizion@vizion.occoxmail.com> To: freebsd-questions@freebsd.org Cc: Kris Kennaway <kris@obsecurity.org> Subject: Re: 5.3->5.4 upgrade method Message-ID: <200505261359.15878.vizion@vizion.occoxmail.com> In-Reply-To: <20050526203752.GA28228@xor.obsecurity.org> References: <20050526194137.GB50503@keyslapper.net> <20050526203752.GA28228@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_jijlCo2HDw9kbDE
Content-Type: text/plain;
charset="iso-8859-6"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Thursday 26 May 2005 13:37, the author Kris Kennaway contributed to the=
=20
dialogue on Re: 5.3->5.4 upgrade method:
>On Thu, May 26, 2005 at 03:41:38PM -0400, Louis LeBlanc wrote:
>> Ok, I've settled on upgrading to 5.4 (from 5.4 RELEASE) but I can't
>> find an explicit statement that performing such an upgrade with
>> cvsup/buildworld/buildkernel, etc. would be ok. No kernel config
>> gotchas mentioned either. Of course it seems implied that this would
>> be a perfectly fine way to do the upgrade.
>>
>> Has anyone else used this upgrade method going from 5.3 to 5.4?
>> Any caveats on the kernel config?
>
>Yes, it's fine as long as you precisely follow the upgrade method (see
>handbook and UPDATING).
>
>Kris
However I thought you might find the info in this thread worth watching:
Re: OS check fails on JDK 1.4 & FreeBSD 5.4R
From: Vizion <vizion@vizion.occoxmail.com>
To: freebsd-java@freebsd.org
CC: "Scott I. Remick" <scott@sremick.net>
=20
On Thursday 26 May 2005 09:34, =A0the author Greg Lewis contributed to the=
=20
dialogue on Re: OS check fails on JDK 1.4 & FreeBSD 5.4R:
>On Thu, May 26, 2005 at 12:04:36PM -0400, Scott I. Remick wrote:
>> On Thu, 26 May 2005 09:54:59 -0600, Greg Lewis wrote:
>> > That would be your problem then. =A0The test expects to use -lc_r on 5=
=2Ex
>> > and higher:
>> >
>> > .if ${OSVERSION} > 500000
>> > LINKIT=3D -lc_r
>> > .else
>> > LINKIT=3D -pthread
>> > .endif
>>
>> Isn't that backwards? The default threading library changed from libc_r =
to
>> libpthread in 5.3
>
>I don't know that its backwards, but it could probably use some help.
>-lc_r became the official way early on in 5.x, but was reverted to
>-pthread after 5.2.1. =A0So it was correct for a time, but is now out of
>date. =A0I suspect that the variable should just go away and ${PTHREAD_LIB=
S}
>should take its place.
>
>> > However, you should have libc_r on 5.4:
>>
>> ...
>>
>> > So your machine would seem to be somewhat hosed unless you've
>> > deliberately removed libc_r.
>
>[explanation of removing libc_r snipped]
>
>> So I guess I have 2 questions now:
>>
>> 1) If libpthread is the new default, replacing libc_r, and you have to
>> have all things linked to just one or the other, basically libc_r has be=
en
>> depreciated. How come the OS version check for JDK 1.4 wants libc_r if t=
he
>> OS > 5.0?
>
>Because its old (see above).
>
>> 2) What am I to do now, since the purging of all things libc_r when I
>> upgraded to 5.3 is what ultimately fixed my system and has kept things
>> running smoothly ever since?
>
>You can do one of the following:
>
>1. Try the attached patch. =A0This would be my preference since if it works
> =A0 I'll try and get it committed.
>2. Turn on SKIP_OS_CHECK and eliminate the test altogether.
I have attached the Makefile.diff to this email
freebsd-java@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-java
To unsubscribe, send any mail to "freebsd-java-unsubscribe@freebsd.org"
=2D-=20
40 yrs navigating and computing in blue waters.
English Owner & Captain of British Registered 60' bluewater Ketch S/V Tauru=
s.
Currently in San Diego, CA. Sailing May bound for Europe via Panama Canal.
--Boundary-00=_jijlCo2HDw9kbDE
Content-Type: text/x-diff;
charset="iso-8859-6";
name="Makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="Makefile.diff"
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/java/jdk14/Makefile,v
retrieving revision 1.90
diff -u -r1.90 Makefile
--- Makefile 11 May 2005 21:18:39 -0000 1.90
+++ Makefile 26 May 2005 16:31:42 -0000
@@ -184,17 +184,11 @@
TESTPROG=testos
-.if ${OSVERSION} > 500000
-LINKIT= -lc_r
-.else
-LINKIT= -pthread
-.endif
-
check-os:
.if !defined(SKIP_OS_TEST)
-@mkdir -p ${WRKDIR} ; \
rm -f ${WRKDIR}/${TESTPROG} ; \
- gcc ${LINKIT} -o ${WRKDIR}/${TESTPROG} \
+ gcc ${PTHREAD_LIBS} -o ${WRKDIR}/${TESTPROG} \
${FILESDIR}/${TESTPROG}.c > /dev/null 2>&1
@if [ ! -f ${WRKDIR}/${TESTPROG} ] ; \
then \
--Boundary-00=_jijlCo2HDw9kbDE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505261359.15878.vizion>