Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Feb 2021 12:33:36 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r566057 - head/lang/oo2c
Message-ID:  <202102191233.11JCXaeK090286@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Feb 19 12:33:36 2021
New Revision: 566057
URL: https://svnweb.freebsd.org/changeset/ports/566057

Log:
  - Allow build on all archs
  - Add THREADS option
  
  PR:		250076
  Submitted by:	hamiltcl@verizon.net

Modified:
  head/lang/oo2c/Makefile
  head/lang/oo2c/pkg-plist

Modified: head/lang/oo2c/Makefile
==============================================================================
--- head/lang/oo2c/Makefile	Fri Feb 19 12:02:34 2021	(r566056)
+++ head/lang/oo2c/Makefile	Fri Feb 19 12:33:36 2021	(r566057)
@@ -17,8 +17,6 @@ BUILD_DEPENDS=	xsltproc:textproc/libxslt
 RUN_DEPENDS=	libtool:devel/libtool
 LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
-ONLY_FOR_ARCHS=		amd64 i386
-
 DOCSDIR=	lib/${PORTNAME}
 USES=		gmake libtool:build tar:bzip2
 GNU_CONFIGURE=	yes
@@ -28,8 +26,15 @@ USE_GCC=	any
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	DOCS
+THREADS_DESC=	Build thread support (Must have pthread installed)
 
+OPTIONS_DEFINE=	DOCS THREADS
+OPTIONS_DEFAULT=DOCS
+
+OPTIONS_SUB=	yes
+
+THREADS_CONFIGURE_ON=	--enable-threads=pthreads
+
 post-patch:
 	@${REINPLACE_CMD} 's/dir=@/dir=$${DESTDIR}@/' \
 		 ${WRKSRC}/Makefile.config.in
@@ -42,6 +47,12 @@ post-patch:
 BITS=		32
 .else
 BITS=		64
+.endif
+
+.if ${ARCH} == "powerpc64"
+# .if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
+CFLAGS+=	-fnested-functions
+# .endif
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/lang/oo2c/pkg-plist
==============================================================================
--- head/lang/oo2c/pkg-plist	Fri Feb 19 12:02:34 2021	(r566056)
+++ head/lang/oo2c/pkg-plist	Fri Feb 19 12:33:36 2021	(r566057)
@@ -94,6 +94,8 @@ lib/oo2c/obj/Strings.oh
 lib/oo2c/obj/SysClock.oh
 lib/oo2c/obj/Termination.oh
 lib/oo2c/obj/TextRider.oh
+%%THREADS%%lib/oo2c/obj/Thread/PThread.oh
+%%THREADS%%lib/oo2c/obj/Thread/Semaphore.oh
 lib/oo2c/obj/Time.oh
 lib/oo2c/obj/URI.oh
 lib/oo2c/obj/URI/Authority/RegistryBased.oh
@@ -217,6 +219,8 @@ lib/oo2c/obj/libxml.oh
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/SysClock.html
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/Termination.html
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/TextRider.html
+%%THREADS%%%%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/Thread/PThread.html
+%%THREADS%%%%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/Thread/Semaphore.html
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/Time.html
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/URI.html
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/html/URI/Authority/RegistryBased.html
@@ -340,6 +344,8 @@ lib/oo2c/obj/libxml.oh
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/SysClock.xml
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/Termination.xml
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/TextRider.xml
+%%THREADS%%%%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/Thread/PThread.xml
+%%THREADS%%%%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/Thread/Semaphore.xml
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/Time.xml
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/URI.xml
 %%PORTDOCS%%%%DOCSDIR%%/oocdoc/xml/URI/Authority/RegistryBased.xml
@@ -555,6 +561,10 @@ lib/oo2c/sym/Termination.Doc
 lib/oo2c/sym/Termination.Sym
 lib/oo2c/sym/TextRider.Doc
 lib/oo2c/sym/TextRider.Sym
+%%THREADS%%lib/oo2c/sym/Thread/PThread.Doc
+%%THREADS%%lib/oo2c/sym/Thread/PThread.Sym
+%%THREADS%%lib/oo2c/sym/Thread/Semaphore.Doc
+%%THREADS%%lib/oo2c/sym/Thread/Semaphore.Sym
 lib/oo2c/sym/Time.Doc
 lib/oo2c/sym/Time.Sym
 lib/oo2c/sym/URI.Doc



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