cvs commit: ports/Mk bsd.ruby.mk ports/lang Makefile ports UPDATING ports/lang/ruby18 Makefile pkg-plist ports/lang/ruby18_r Makefile ports/lang/ruby16 Makefile pkg-plist ports/lang/ruby16_r Makefile ports/devel/ruby-gnustep Makefile ...

[Jeremy Messenger]

On Sat, 5 Feb 2005 23:23:42 +0100, Michael Nottebrock  
<michaelnottebrock at gmx.net> wrote:

> On Saturday, 5. February 2005 23:08, Jeremy Messenger wrote:
>
>> I found too, but it's more than a missing. The config.h.orig is w/out
>> patch and config.h is with your patch.
>
>> -#define HAVE_GETCONTEXT 1
>> -#define HAVE_SETCONTEXT 1
>
> Those don't show up here. The NANOSLEEP one is bogus either, it really  
> doesn't have anything to do with the pthread configure checks, so ignore
> that new diff please. If configure doesn't detect those things it will  
> have its own reasons (or bugs).

Here's patch that works a lot better. I don't know if it's good for  
FreeBSD 4.x and other ${ARCH}. I have no idea if the --enable-pthread  
should be for only FreeBSD 5.x or whatever. However, right now I am  
running Asami[1] without any problem.

[1] http://asami.rubyforge.org/

Cheers,
Mezz


-- 
mezz7 at cox.net  -  mezz at FreeBSD.org
FreeBSD GNOME Team
http://www.FreeBSD.org/gnome/  -  gnome at FreeBSD.org
-------------- next part --------------
--- Makefile.orig	Sat Feb  5 16:51:21 2005
+++ Makefile	Sat Feb  5 17:08:12 2005
@@ -42,6 +42,7 @@
 RUBY_NO_RUN_DEPENDS=	yes
 
 #USE_AUTOCONF=	yes	# does not work with 2.13; requires 2.53 or later
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
@@ -58,12 +59,12 @@
 LATEST_LINK=	ruby-devel
 
 .include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502102
 RUBY_ENABLE_PTHREAD?=	public demand
-.endif
 
 .if defined(RUBY_ENABLE_PTHREAD) && ${RUBY_ENABLE_PTHREAD} != "no"
 CONFIGURE_ARGS+=	--enable-pthread
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+			LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
 
 # There seems to be a bug in either gcc or libpthread that gets
 # (mini)ruby to malfunction..
@@ -134,6 +135,8 @@
 	${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/
 
 post-patch:
+	${REINPLACE_CMD} -e 's|-l$$pthread_lib|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
 	${FIND} ${PATCH_WRKSRC} -name '*.orig' -delete
 .for d in Win32API
 	${RM} -rf ${BUILD_WRKSRC}/ext/${d}