Date: Tue, 13 May 2003 09:06:56 -0500 (GMT) From: Sean Welch <welchsm@earthlink.net> To: Roman Neuhauser <neuhauser@bellavista.cz>, Sean_Welch@alum.wofford.org Cc: freebsd-ports@FreeBSD.org Subject: Re: Re: Problems building mesagl on FreeBSD4.8-RELEASE Message-ID: <2631993.1052842016851.JavaMail.nobody@bert.psp.pas.earthlink.net>
next in thread | raw e-mail | index | archive | help
Thanks for the response, Roman. I'll look into the PR capture
route.
No, I don't think this will break anything as it is the pattern
in the original patch that is incorrect. The original patch-aa
won't apply and the port stops building immediately because of
it. This is a patch to that patch.
This does mean that the source is built with a -pthread; perhaps
the original patch should have done a replacement such as:
- THREAD_LIBS="$THREAD_LIBS -pthread"
+ THREAD_LIBS="$THREAD_LIBS -lc_r"
rather than the current patch-aa line (which is SUPPOSED to
be just a match as written):
THREAD_LIBS="$THREAD_LIBS -lc_r"
In that case, the revised patch would be as follows:
--- patch-aa.orig Sat May 10 15:33:00 2003
+++ patch-aa Mon May 12 14:59:31 2003
@@ -32,6 +32,6 @@
echo "${ECHO_T}yes" >&6
- CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS"
+ CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS"
- THREAD_LIBS="$THREAD_LIBS -lc_r"
+- THREAD_LIBS="$THREAD_LIBS -pthread"
++ THREAD_LIBS="$THREAD_LIBS -lc_r"
else
echo "$as_me: failed program was:" >&5
-------Original Message-------
From: Roman Neuhauser <neuhauser@bellavista.cz>
Sent: 05/13/03 10:39 AM
To: Sean_Welch@alum.wofford.org
Subject: Re: Problems building mesagl on FreeBSD4.8-RELEASE
>
> # welchsm@earthlink.net / 2003-05-12 13:08:35 -0500:
> I would file a PR, but as none of my FreeBSD systems
> are set up to mail directly I can't use send-pr (using
> webmail currently), and the web interface at freebsd.org
> is still not available.
>
> I had to apply the following patch (to a patch) in
> order to get it to compile:
>
> --- patch-aa.orig Sat May 10 15:33:00 2003
> +++ patch-aa Mon May 12 14:59:31 2003
> @@ -32,6 +32,6 @@
> echo "${ECHO_T}yes" >&6
> - CFLAGS="$CFLAGS -D_REENTRANT -DPTHREADS"
> + CFLAGS="$CFLAGS -D_THREAD_SAFE -D_REENTRANT -DPTHREADS"
> - THREAD_LIBS="$THREAD_LIBS -lc_r"
> + THREAD_LIBS="$THREAD_LIBS -pthread"
> else
> echo "$as_me: failed program was:" >&5
I'll take the risk of making a fool of myself...
I'm not quite sure, but this change would break the build for 5.x
boxen. You'd have to add more logic to differentiate between the
branches. BTW, you can have send-pr(1) save the PR instead of
expediting it out. Maybe you could post a complete PR here?
--
If you cc me or remove the list(s) completely I'll most likely ignore
your message. see <a target=_blank
href="http://www.eyrie.org./~eagle/faqs/questions.html">http://www.eyrie.org./~eagle/faqs/questions.html</a>;
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2631993.1052842016851.JavaMail.nobody>