From gahr@gahr.ch  Mon Nov 12 14:52:49 2007
Return-Path: <gahr@gahr.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B62F916A419
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Nov 2007 14:52:49 +0000 (UTC)
	(envelope-from gahr@gahr.ch)
Received: from cpanel03.rubas-s03.net (cpanel03.rubas-s03.net [195.182.222.73])
	by mx1.freebsd.org (Postfix) with ESMTP id 465D913C4B6
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Nov 2007 14:52:49 +0000 (UTC)
	(envelope-from gahr@gahr.ch)
Received: from 80-218-191-236.dclient.hispeed.ch ([80.218.191.236] helo=gahrtop.localhost)
	by cpanel03.rubas-s03.net with esmtpa (Exim 4.63)
	(envelope-from <gahr@gahr.ch>)
	id 1IraeO-00080Z-QD
	for FreeBSD-gnats-submit@freebsd.org; Mon, 12 Nov 2007 15:52:32 +0100
Received: from gahrtop.localhost (localhost [127.0.0.1])
	by gahrtop.localhost (Postfix) with ESMTP id 8899173085
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Nov 2007 15:52:27 +0100 (CET)
Message-Id: <1194879147.79684@gahrtop.localhost>
Date: Mon, 12 Nov 2007 15:52:27 +0100
From: "Pietro Cerutti" <Pietro Cerutti <gahr@gahr.ch>>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [patch] audio/teknap unbreak fix build with GCC 4.2
X-Send-Pr-Version: gtk-send-pr 0.4.8 
X-GNATS-Notify:

>Number:         118006
>Category:       ports
>Synopsis:       [patch] audio/teknap unbreak fix build with GCC 4.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 12 15:00:04 UTC 2007
>Closed-Date:    Wed Nov 14 08:20:21 UTC 2007
>Last-Modified:  Wed Nov 14 08:30:04 UTC 2007
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
Bern University of Applied Sciences 
>Environment:


System: FreeBSD 8.0-CURRENT #9: Fri Nov  9 14:50:37 CET 2007
    root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


- fixed a few "static declaration follows non-static declaration" errors
- fixed a ${TAR} option in the Makefile


>How-To-Repeat:


cd /usr/ports/audio/teknap && make


>Fix:


--- _teknap.diff begins here ---
--- Makefile.orig	2007-11-12 15:39:03.000000000 +0100
+++ Makefile	2007-11-12 15:46:47.000000000 +0100
@@ -35,10 +35,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if ${HAVE_GNOME:Mgtk12}!=""
 USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=--with-gtk
@@ -67,7 +63,7 @@
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/TekNap
-	${TAR} --directory ${WRKSRC}/teknap-help -cf - . --exclude CVS | \
+	${TAR} --directory ${WRKSRC}/teknap-help -cf - . | \
 	${TAR} --directory ${PREFIX}/share/TekNap/help -xf -
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/TekNap
 	@${ECHO}
--- /dev/null	2007-11-12 15:47:50.000000000 +0100
+++ files/patch-source_share.c	2007-11-12 15:45:30.000000000 +0100
@@ -0,0 +1,11 @@
+--- source/share.c.orig	2007-11-12 15:41:18.000000000 +0100
++++ source/share.c	2007-11-12 15:43:42.000000000 +0100
+@@ -38,7 +38,7 @@
+ 
+ static pthread_mutex_t quit_mutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+-static pthread_mutex_t fserv_struct_mutex = PTHREAD_MUTEX_INITIALIZER;
++pthread_mutex_t fserv_struct_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_t shared_count_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static void share_thread_signal_setup(void);
+ 
--- /dev/null	2007-11-12 15:47:50.000000000 +0100
+++ files/patch-source_timer.c	2007-11-12 15:45:44.000000000 +0100
@@ -0,0 +1,11 @@
+--- source/timer.c.orig	2007-11-12 15:43:52.000000000 +0100
++++ source/timer.c	2007-11-12 15:44:47.000000000 +0100
+@@ -145,7 +145,7 @@
+  * This is put here on purpose -- we dont want any of the above functions
+  * to have any knowledge of this struct.
+  */
+-static TimerList *PendingTimers;
++TimerList *PendingTimers;
+ static char *schedule_timer (TimerList *ntimer);
+ 
+ static char *current_exec_timer = empty_string;
--- _teknap.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue Nov 13 07:43:48 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118006 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Nov 14 08:20:20 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=118006 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/118006: commit references a PR
Date: Wed, 14 Nov 2007 08:23:21 +0000 (UTC)

 miwi        2007-11-14 08:23:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/teknap         Makefile 
   Added files:
     audio/teknap/files   patch-source_share.c patch-source_timer.c 
   Log:
   - Fix build with gcc 4.2
   
   PR:             118006
   Submitted by:   Pietro Cerutti <gahr@gahr.ch>
   Approved by:    portmgr (erwin)
   
   Revision  Changes    Path
   1.21      +1 -5      ports/audio/teknap/Makefile
   1.1       +11 -0     ports/audio/teknap/files/patch-source_share.c (new)
   1.1       +11 -0     ports/audio/teknap/files/patch-source_timer.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
