Bug 180516 - audio/epos-devel: Fix build with clang
Summary: audio/epos-devel: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-12 19:10 UTC by tkato432
Modified: 2013-07-16 06:50 UTC (History)
0 users

See Also:


Attachments
file.diff (2.31 KB, patch)
2013-07-12 19:10 UTC, tkato432
no flags Details | Diff
audio_epos-devel.diff (2.36 KB, patch)
2013-07-15 19:00 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-07-12 19:10:06 UTC
- Fix build with clang

Nes file:
files/patch-src__nnet__map.h
files/patch-src__nnet__neural_parse.yy
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-07-12 19:11:39 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-07-15 16:12:30 UTC
State Changed
From-To: open->feedback

build fails http://po.miwibox.org:1288/bulk/latest-per-pkg/epos/2.5.37/
Comment 3 tkato432 2013-07-15 19:00:00 UTC
Here is the corrected patch.
Comment 4 Martin Wilke freebsd_committer freebsd_triage 2013-07-16 06:47:49 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-07-16 06:48:24 UTC
Author: miwi
Date: Tue Jul 16 05:48:14 2013
New Revision: 323095
URL: http://svnweb.freebsd.org/changeset/ports/323095

Log:
  - Fix build clang
  
  PR:		180516
  Submitted by:	maintainer

Added:
  head/audio/epos-devel/files/patch-src__nnet__map.h   (contents, props changed)
  head/audio/epos-devel/files/patch-src__nnet__neural_parse.yy   (contents, props changed)
Modified:
  head/audio/epos-devel/Makefile   (contents, props changed)

Modified: head/audio/epos-devel/Makefile
==============================================================================
--- head/audio/epos-devel/Makefile	Tue Jul 16 05:47:05 2013	(r323094)
+++ head/audio/epos-devel/Makefile	Tue Jul 16 05:48:14 2013	(r323095)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    epos-devel
-# Date created:         3 September 2005
-# Whom:                 Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	epos
 PORTVERSION=	2.5.37
@@ -15,14 +11,15 @@ COMMENT=	Text-to-Speech system
 
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/doc/COPYING
-LICENSE_FILE_LGPL20=	${WRKSRC}/libs/regex/COPYING.LIB
 
+USES=		bison gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+CONFIGURE_ENV=	ac_cv_lib_stdcpp_main=no
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's/^\(SUBDIRS =.*\)doc/\1/' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's/^\(SUBDIRS =.*\)doc/\1/' ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-ggdb||'
 
 .include <bsd.port.mk>

Added: head/audio/epos-devel/files/patch-src__nnet__map.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/epos-devel/files/patch-src__nnet__map.h	Tue Jul 16 05:48:14 2013	(r323095)
@@ -0,0 +1,11 @@
+--- src/nnet/map.h.orig
++++ src/nnet/map.h
+@@ -25,7 +25,7 @@
+ 	else {
+ 		TData x;
+ 		x.first() = key;
+-		return insert (x)->second();
++		return this->insert (x)->second();
+ 	}
+ }
+ 

Added: head/audio/epos-devel/files/patch-src__nnet__neural_parse.yy
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/epos-devel/files/patch-src__nnet__neural_parse.yy	Tue Jul 16 05:48:14 2013	(r323095)
@@ -0,0 +1,11 @@
+--- src/nnet/neural_parse.yy.orig
++++ src/nnet/neural_parse.yy
+@@ -255,7 +255,7 @@
+ 
+ int yyerror (char *s)
+ {
+-	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf, s));
++	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf.c_str(), s));
+ 	return -1;
+ }
+
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"