From owner-cvs-ports@FreeBSD.ORG Sun Feb 6 01:37:42 2005 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B630F16A4CE; Sun, 6 Feb 2005 01:37:42 +0000 (GMT) Received: from lakermmtao03.cox.net (lakermmtao03.cox.net [68.230.240.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7D7843D49; Sun, 6 Feb 2005 01:37:41 +0000 (GMT) (envelope-from mezz7@cox.net) Received: from mezz.mezzweb.com ([68.103.32.140]) by lakermmtao03.cox.net (InterMail vM.6.01.04.00 201-2131-117-20041022) with ESMTP id <20050206013739.RLHK951.lakermmtao03.cox.net@mezz.mezzweb.com>; Sat, 5 Feb 2005 20:37:39 -0500 To: "Michael Nottebrock" References: <200502050459.j154xROQ094820@repoman.freebsd.org> <200502052249.34648.michaelnottebrock@gmx.net> <200502052323.46606.michaelnottebrock@gmx.net> Message-ID: Date: Sat, 05 Feb 2005 19:38:21 -0600 From: "Jeremy Messenger" Content-Type: multipart/mixed; boundary=----------clivS0cGJEusUNtPMETwXF MIME-Version: 1.0 In-Reply-To: <200502052323.46606.michaelnottebrock@gmx.net> User-Agent: Opera M2/7.54 (Linux, build 955) cc: cvs-ports@freebsd.org cc: cvs-all@freebsd.org cc: Akinori MUSHA cc: ports-committers@freebsd.org Subject: Re: 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 ... X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Feb 2005 01:37:42 -0000 ------------clivS0cGJEusUNtPMETwXF Content-Type: text/plain; format=flowed; delsp=yes; charset=us-ascii Content-Transfer-Encoding: 8bit On Sat, 5 Feb 2005 23:23:42 +0100, Michael Nottebrock 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@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org ------------clivS0cGJEusUNtPMETwXF Content-Disposition: attachment; filename=Makefile.diff Content-Type: text/plain; name=Makefile.diff Content-Transfer-Encoding: 8bit --- 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 -.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} ------------clivS0cGJEusUNtPMETwXF--