Date: Mon, 5 Aug 2013 20:37:36 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> 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 Message-ID: <201308052037.r75Kba5i021735@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <vmagerya@gmail.com> 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308052037.r75Kba5i021735>