Date: Thu, 6 Dec 2007 20:35:50 +0100 From: "Pietro Cerutti" <gahr@gahr.ch> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/118469: [patch] textproc/opensched unbreak fix build with GCC 4.2 + adopt maintainship Message-ID: <1196969750.646@gahrtop.localhost> Resent-Message-ID: <200712061940.lB6Je2kv065599@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118469 >Category: ports >Synopsis: [patch] textproc/opensched unbreak fix build with GCC 4.2 + adopt maintainship >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Dec 06 19:40:02 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: FreeBSD 8.0-CURRENT i386 >Organization: >Environment: System: FreeBSD 8.0-CURRENT #15: Thu Dec 6 12:47:48 CET 2007 root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034 >Description: The patch below: - removes the BREAK Makefile line (it does install cleanly) - cleans warnings - sets maintainship to me >How-To-Repeat: cd /usr/ports/textproc/opensched && make >Fix: --- _opensched.diff begins here --- --- Makefile.orig 2007-11-27 01:42:20.000000000 +0100 +++ Makefile 2007-11-27 01:53:30.000000000 +0100 @@ -11,7 +11,7 @@ CATEGORIES= textproc MASTER_SITES= http://mtechit.com/dlsoftware/opensched/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gahr@gahr.ch COMMENT= A project scheduler BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX @@ -23,12 +23,6 @@ .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700042 -.if ${ARCH} == "i386" -BROKEN= Does not install -.endif -.endif - .if ${ARCH} == "alpha" BROKEN= Does not compile .endif --- /dev/null 2007-11-27 01:53:37.000000000 +0100 +++ files/patch-src_sched.c 2007-11-27 01:52:27.000000000 +0100 @@ -0,0 +1,37 @@ +--- src/sched.c.orig 2007-11-27 01:48:37.000000000 +0100 ++++ src/sched.c 2007-11-27 01:52:14.000000000 +0100 +@@ -107,7 +107,6 @@ + + int FirstFreeTime(TASK *task, RESOURCE *r, int earliest, int duration) + { +- TASK *t; + int i; + + if( debug_sched ) +@@ -121,7 +120,7 @@ + } + + Error("Resource %s not available to do %s at time >= %s", +- r->id, t->id, days[earliest].s); ++ r->id, task->id, days[earliest].s); + + // never reached + return -1; +@@ -130,7 +129,7 @@ + void AddTimeBlock(TASK *task, TIMEBLOCK **tblist, int tstart, int tfinish, + enum timetype type) + { +- TIMEBLOCK **tbp; ++ TIMEBLOCK **tbp = NULL; + + if ( debug_sched ) + Warning("AddTimeblock(%p,%s,%d,%d)", tbp, task->id, tstart, tfinish); +@@ -519,7 +518,7 @@ + RESOURCE *FindEarliestResource(TASK *t, int t_earliest) + { + RESLIST *rl; +- RESOURCE *r; ++ RESOURCE *r = NULL; + int tmin = MAX_TIME, tr; + + for( rl=t->cando; rl!=NULL; rl=rl->next ) --- _opensched.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1196969750.646>