Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  2 Oct 2006 15:23:31 +0200 (CEST)
From:      trasz <trasz@pin.if.uz.zgora.pl>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/103902: [PATCH] shells/v7sh: fix build with gcc41
Message-ID:  <20061002132331.5D3FE3A3E6@pin.if.uz.zgora.pl>
Resent-Message-ID: <200610021330.k92DUI5g017175@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         103902
>Category:       ports
>Synopsis:       [PATCH] shells/v7sh: fix build with gcc41
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 02 13:30:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     trasz
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jun  3 01:12:10 CEST
>Description:
Fix build with gcc41.

(http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2006092721/v7sh-1.0.log)

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- v7sh-1.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/shells/v7sh/Makefile /home/trasz/v7sh/Makefile
--- /usr/ports/shells/v7sh/Makefile	Fri Dec  2 03:05:38 2005
+++ /home/trasz/v7sh/Makefile	Mon Oct  2 15:21:45 2006
@@ -29,6 +29,7 @@
 
 NO_WRKSUBDIR=	yes
 MAN1=		${PORTNAME}.1
+MANCOMPRESSED=	yes
 
 OPTIONS=	V7SH_SYSIII	"System III enhancements"	on \
 		V7SH_RENO	"4.3BSD-Reno enhancements"	on \
diff -ruN --exclude=CVS /usr/ports/shells/v7sh/files/patch-mode.h /home/trasz/v7sh/files/patch-mode.h
--- /usr/ports/shells/v7sh/files/patch-mode.h	Tue Jun 22 10:24:18 2004
+++ /home/trasz/v7sh/files/patch-mode.h	Mon Oct  2 15:21:43 2006
@@ -1,6 +1,5 @@
-diff -u -x CVS -x work -x core -x *.core -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $.+BSD.*$ mode.h.orig mode.h
---- mode.h.orig	Fri Jun  4 02:51:02 2004
-+++ mode.h	Sat Jun 19 18:42:23 2004
+--- mode.h.orig	Mon Oct  2 15:16:25 2006
++++ mode.h	Mon Oct  2 15:17:01 2006
 @@ -1,6 +1,10 @@
  #
  /*
@@ -57,16 +56,17 @@
  STRUCT forknod	*FORKPTR;
  STRUCT comnod	*COMPTR;
  STRUCT swnod	*SWPTR;
-@@ -44,7 +63,7 @@
+@@ -43,8 +62,7 @@
+ STRUCT namnod	*NAMPTR;
  STRUCT sysnod	SYSNOD;
  STRUCT sysnod	*SYSPTR;
- STRUCT sysnod	SYSTAB[];
+-STRUCT sysnod	SYSTAB[];
 -#define NIL	((char*)0)
 +#define NIL	((void*)0)
  
  
  /* the following nonsense is required
-@@ -52,8 +71,12 @@
+@@ -52,8 +70,12 @@
   * into an Rvalue so two cheats
   * are necessary, one for each context.
   */
@@ -81,7 +81,7 @@
  #define Rcheat(a)	((int)(a))
  
  
-@@ -69,11 +92,13 @@
+@@ -69,11 +91,13 @@
  	BLKPTR	_blkptr;
  	NAMPTR	_namptr;
  	BYTPTR	_bytptr;
@@ -96,7 +96,7 @@
  
  
  /* heap storage */
-@@ -90,7 +115,7 @@
+@@ -90,7 +114,7 @@
  	STRING	fnxt;
  	STRING	fend;
  	STRING	*feval;
@@ -105,7 +105,7 @@
  	CHAR	fbuf[BUFSIZ];
  };
  
-@@ -103,21 +128,15 @@
+@@ -103,20 +127,16 @@
  	STRING	fnxt;
  	STRING	fend;
  	STRING	*feval;
@@ -125,11 +125,11 @@
 -	INT	tretyp;
 -	IOPTR	treio;
 -};
--
++STRUCT sysnod	SYSTAB[];
+ 
  /* dummy for access only */
  struct argnod {
- 	ARGPTR	argnxt;
-@@ -203,3 +222,16 @@
+@@ -203,3 +223,16 @@
  #define	PARTYPE		(sizeof(struct parnod))
  #define	LSTTYPE		(sizeof(struct lstnod))
  #define	IOTYPE		(sizeof(struct ionod))
--- v7sh-1.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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