Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Mar 2015 08:57:37 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r382294 - head/Mk
Message-ID:  <201503260857.t2Q8vbn4043988@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Thu Mar 26 08:57:36 2015
New Revision: 382294
URL: https://svnweb.freebsd.org/changeset/ports/382294
QAT: https://qat.redports.org/buildarchive/r382294/

Log:
  Mk: remove PTHREAD_LIBS and PTHREAD_CFLAGS variable
  
  For bsd.gecko.mk, replace PTHREAD_LIBS with "-pthread", the same value
  it was using before.
  
  Approved by:	PTHREAD blanket (completes task)
  Approved by:	portmgr (bapt)

Modified:
  head/Mk/bsd.gecko.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Thu Mar 26 08:38:24 2015	(r382293)
+++ head/Mk/bsd.gecko.mk	Thu Mar 26 08:57:36 2015	(r382294)
@@ -523,8 +523,8 @@ gecko-post-patch:
 			${MOZSRC}/configure \
 			${WRKSRC}/configure; do \
 		if [ -f $$f ] ; then \
-			${REINPLACE_CMD} -Ee 's|-lc_r|${PTHREAD_LIBS}|g ; \
-				s|-l?pthread|${PTHREAD_LIBS}|g ; \
+			${REINPLACE_CMD} -Ee 's|-lc_r|-pthread|g ; \
+				s|-l?pthread|-pthread}|g ; \
 				s|echo aout|echo elf|g ; \
 				s|/usr/X11R6|${LOCALBASE}|g' \
 				$$f; \

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Mar 26 08:38:24 2015	(r382293)
+++ head/Mk/bsd.port.mk	Thu Mar 26 08:57:36 2015	(r382294)
@@ -2069,9 +2069,6 @@ BUILD_FAIL_MESSAGE+=	Try to set MAKE_JOB
 
 .include "${PORTSDIR}/Mk/bsd.ccache.mk"
 
-PTHREAD_CFLAGS?=
-PTHREAD_LIBS?=		-pthread
-
 FETCH_ENV?=		SSL_NO_VERIFY_PEER=1 SSL_NO_VERIFY_HOSTNAME=1
 FETCH_BINARY?=	/usr/bin/fetch
 FETCH_ARGS?=	-Fpr



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503260857.t2Q8vbn4043988>