NetBSD Problem Report #25946

Received: (qmail 9385 invoked by uid 605); 16 Jun 2004 16:17:02 -0000
Message-Id: <20040616161743.25405AB06@orinoco.my.domain>
Date: Thu, 17 Jun 2004 01:17:43 +0900 (JST)
From: hiramatu@boreas.dti.ne.jp
Sender: gnats-bugs-owner@NetBSD.org
Reply-To: hiramatu@boreas.dti.ne.jp
To: gnats-bugs@gnats.NetBSD.org
Subject: shells/zsh fixes for Interix
X-Send-Pr-Version: 3.95

>Number:         25946
>Category:       pkg
>Synopsis:       shells/zsh fixes for Interix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    minskim
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jun 16 16:18:00 +0000 2004
>Closed-Date:    Wed Aug 04 03:36:28 +0000 2004
>Last-Modified:  Wed Aug 04 03:36:28 +0000 2004
>Originator:     Hiramatsu Yoshifumi
>Release:        SFU 3.5
>Organization:

>Environment:


System: Interix nile 3.5 SP-8.0.1969.1 x86 AMD Athlon/Duron
Architecture: i386
Machine: i386
>Description:
This patch fixes two build problems of shells/zsh.
patch-af:
 - Interix doesn't define XTABS

patch-ag:
 - Fix for configure script to detect shared library capability.
   Need to build dlls.

>How-To-Repeat:

>Fix:

diff -buNr zsh.orig/distinfo zsh/distinfo
--- zsh.orig/distinfo	Wed Jun 16 23:41:24 2004
+++ zsh/distinfo	Sun Jun 13 08:29:44 2004
@@ -4,3 +4,5 @@
 Size (zsh-4.2.0.tar.bz2) = 1990884 bytes
 SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
 SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48
+SHA1 (patch-af) = e499b4b98cb355c0b8c5344f5052f9b3470d33b1
+SHA1 (patch-ag) = 65c246c2e5a2c9f51c0733bde44c8ef99e2f4159
diff -buNr zsh.orig/patches/patch-af zsh/patches/patch-af
--- zsh.orig/patches/patch-af	Thu Jan  1 09:00:00 1970
+++ zsh/patches/patch-af	Sun Jun 13 08:29:44 2004
@@ -0,0 +1,18 @@
+--- Src/zsh.h.orig	Sun Jun 13 07:54:54 2004
++++ Src/zsh.h	Sun Jun 13 07:55:45 2004
+@@ -1565,6 +1565,7 @@
+ #endif
+ };
+ 
++#if !defined(__INTERIX)
+ /* defines for whether tabs expand to spaces */
+ #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
+ #define SGTTYFLAG       shttyinfo.tio.c_oflag
+@@ -1580,6 +1581,7 @@
+ #define SGTABTYPE       XTABS
+ #  endif
+ # endif
++#endif
+ 
+ /* flags for termflags */
+ 
diff -buNr zsh.orig/patches/patch-ag zsh/patches/patch-ag
--- zsh.orig/patches/patch-ag	Thu Jan  1 09:00:00 1970
+++ zsh/patches/patch-ag	Sun Jun 13 08:29:44 2004
@@ -0,0 +1,22 @@
+--- configure.orig	Sun Jun 13 08:21:31 2004
++++ configure	Sun Jun 13 08:21:38 2004
+@@ -13652,6 +13652,10 @@
+         DLLD="${DLLD=$CC}"
+         DLLDARG=""
+       ;;
++      *interix*)
++        DLLD="${DLLD=$CC}"
++        DLLDARG=""
++      ;;
+       * )
+ 	DLLD="${DLLD=ld}"
+ 	DLLDARG=""
+@@ -13675,7 +13679,7 @@
+     esac
+   fi
+   case "$host_os" in
+-    freebsd*|linux*|irix*|osf*|gnu*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
++    freebsd*|linux*|irix*|osf*|gnu*|interix*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+     sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
+     sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
+     netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->minskim 
Responsible-Changed-By: minskim 
Responsible-Changed-When: Wed Aug 4 03:29:11 UTC 2004 
Responsible-Changed-Why:  
I'll take this. 

From: Min Sik Kim <minskim@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:  
Subject: pr/25946 CVS commit: pkgsrc/shells/zsh
Date: Wed,  4 Aug 2004 03:33:40 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	minskim
 Date:		Wed Aug  4 03:33:40 UTC 2004

 Modified Files:
 	pkgsrc/shells/zsh: distinfo
 Added Files:
 	pkgsrc/shells/zsh/patches: patch-ab patch-ac

 Log Message:
 Make this package build on Interix.  Patches provided by Hiramatsu Yoshifumi
 in PR pkg/25946.


 To generate a diff of this commit:
 cvs rdiff -r1.15 -r1.16 pkgsrc/shells/zsh/distinfo
 cvs rdiff -r0 -r1.9 pkgsrc/shells/zsh/patches/patch-ab
 cvs rdiff -r0 -r1.13 pkgsrc/shells/zsh/patches/patch-ac

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed 
State-Changed-By: minskim 
State-Changed-When: Wed Aug 4 03:35:03 UTC 2004 
State-Changed-Why:  
Applied.  Thanks! 
>Unformatted:

Home	PR Database Search