From owner-svn-ports-all@FreeBSD.ORG Mon Aug 5 20:37:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDC13B4C; Mon, 5 Aug 2013 20:37:36 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B1B4026EE; Mon, 5 Aug 2013 20:37:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r75KbaO5021738; Mon, 5 Aug 2013 20:37:36 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r75Kba5i021735; Mon, 5 Aug 2013 20:37:36 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201308052037.r75Kba5i021735@svn.freebsd.org> From: Matthias Andree Date: Mon, 5 Aug 2013 20:37:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324286 - in head/lang: lua lua/files lua52 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Aug 2013 20:37:36 -0000 Author: mandree Date: Mon Aug 5 20:37:35 2013 New Revision: 324286 URL: http://svnweb.freebsd.org/changeset/ports/324286 Log: Link lua .so + program with pthread to prevent hangs in extensions that use pthreads. Bump PORTREVISION to pull this in. PR: ports/181052 Submitted by: Vitaly Magerya Approved by: mandree@ on behalf of lua@ Modified: head/lang/lua/Makefile head/lang/lua/files/patch-src-Makefile head/lang/lua52/Makefile Modified: head/lang/lua/Makefile ============================================================================== --- head/lang/lua/Makefile Mon Aug 5 20:21:58 2013 (r324285) +++ head/lang/lua/Makefile Mon Aug 5 20:37:35 2013 (r324286) @@ -3,7 +3,7 @@ PORTNAME= lua PORTVERSION= 5.1.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ ftp://ftp.ntua.gr/pub/lang/lua/ \ @@ -33,7 +33,7 @@ MAKE_ENV= LUA_SONAME="liblua-${LUA_VER}. MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} # liblua.so requires libm, so make sure it has an explicit dependency # so that applications need not second-guess lua's dependencies. -LDFLAGS+= -lm +LDFLAGS+= -lm -pthread MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1 DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR} Modified: head/lang/lua/files/patch-src-Makefile ============================================================================== --- head/lang/lua/files/patch-src-Makefile Mon Aug 5 20:21:58 2013 (r324285) +++ head/lang/lua/files/patch-src-Makefile Mon Aug 5 20:37:35 2013 (r324286) @@ -1,6 +1,6 @@ ---- Makefile.orig 2008-01-19 17:37:58.000000000 -0200 -+++ Makefile 2008-08-10 16:00:41.000000000 -0300 -@@ -9,7 +9,8 @@ +--- Makefile.orig 2012-02-13 22:41:22.000000000 +0200 ++++ Makefile 2013-08-05 15:56:32.000000000 +0300 +@@ -9,10 +9,11 @@ CC= gcc CFLAGS= -O2 -Wall $(MYCFLAGS) @@ -9,7 +9,11 @@ +AR= ar RANLIB= ranlib RM= rm -f - LIBS= -lm $(MYLIBS) +-LIBS= -lm $(MYLIBS) ++LIBS= -lm -pthread $(MYLIBS) + + MYCFLAGS= + MYLDFLAGS= @@ -31,12 +32,13 @@ LUA_T= lua Modified: head/lang/lua52/Makefile ============================================================================== --- head/lang/lua52/Makefile Mon Aug 5 20:21:58 2013 (r324285) +++ head/lang/lua52/Makefile Mon Aug 5 20:37:35 2013 (r324286) @@ -3,6 +3,7 @@ PORTNAME= lua PORTVERSION= 5.2.2 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ @@ -30,7 +31,7 @@ MAKE_ENV= LUA_SONAME="liblua-${LUA_VER}. MYCFLAGS="${CFLAGS}" MYLDFLAGS="${LDFLAGS}" # liblua.so requires libm, so make sure it has an explicit dependency # so that applications need not second-guess lua's dependencies. -LDFLAGS+= -lm +LDFLAGS+= -lm -pthread MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1 DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR}