From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-9253-mason-zsh=primenet.com.au@sunsite.auc.dk>
Received: (qmail 15976 invoked from network); 6 Jan 2000 16:14:12 -0000
Received: from sunsite.auc.dk (130.225.51.30)
  by ns1.primenet.com.au with SMTP; 6 Jan 2000 16:14:12 -0000
Received: (qmail 3984 invoked by alias); 6 Jan 2000 16:14:06 -0000
Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 9253
Received: (qmail 3977 invoked from network); 6 Jan 2000 16:14:05 -0000
Message-ID: <3874BF4A.BBDEA982@u.genie.co.uk>
Date: Thu, 06 Jan 2000 16:14:02 +0000
From: Oliver Kiddle <opk@u.genie.co.uk>
X-Mailer: Mozilla 4.7 [en] (Win95; I)
X-Accept-Language: en
MIME-Version: 1.0
To: Zsh workers <zsh-workers@sunsite.auc.dk>
Subject: PATCH: More AIX dependencies
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Here's the latest installment of things to get it to compile on AIX. Most caused by the module alias changes.

All the aliases do depend on the master zsh - they need to for zerr which they get from the modentry.o they are linked with. There was a problem with the generated Makefiles for modules (the -bI: being omitted for imports) and a few new things for the .export files.

Oliver

--- Src/Aliases/cap.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/cap.mdd	Thu Jan  6 12:06:49 2000
@@ -1,7 +1,5 @@
 name=cap
 
-nozshdep=1
-
 moddeps="zsh/cap"
 
 objects="cap.o"
--- Src/Aliases/clone.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/clone.mdd	Thu Jan  6 12:06:52 2000
@@ -1,7 +1,5 @@
 name=clone
 
-nozshdep=1
-
 moddeps="zsh/clone"
 
 objects="clone.o"
--- Src/Aliases/compctl.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/compctl.mdd	Thu Jan  6 12:06:56 2000
@@ -1,7 +1,5 @@
 name=compctl
 
-nozshdep=1
-
 moddeps="zsh/compctl"
 
 objects="compctl.o"
--- Src/Aliases/complete.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/complete.mdd	Thu Jan  6 12:06:59 2000
@@ -1,7 +1,5 @@
 name=complete
 
-nozshdep=1
-
 moddeps="zsh/complete"
 
 objects="complete.o"
--- Src/Aliases/complist.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/complist.mdd	Thu Jan  6 12:07:03 2000
@@ -1,7 +1,5 @@
 name=complist
 
-nozshdep=1
-
 moddeps="zsh/complist"
 
 objects="complist.o"
--- Src/Aliases/computil.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/computil.mdd	Thu Jan  6 12:07:07 2000
@@ -1,7 +1,5 @@
 name=computil
 
-nozshdep=1
-
 moddeps="zsh/computil"
 
 objects="computil.o"
--- Src/Aliases/deltochar.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/deltochar.mdd	Thu Jan  6 12:07:11 2000
@@ -1,7 +1,5 @@
 name=deltochar
 
-nozshdep=1
-
 moddeps="zsh/deltochar"
 
 objects="deltochar.o"
--- Src/Aliases/example.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/example.mdd	Thu Jan  6 12:07:14 2000
@@ -1,7 +1,5 @@
 name=example
 
-nozshdep=1
-
 moddeps="zsh/example"
 
 objects="example.o"
--- Src/Aliases/files.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/files.mdd	Thu Jan  6 12:07:17 2000
@@ -1,7 +1,5 @@
 name=files
 
-nozshdep=1
-
 moddeps="zsh/files"
 
 objects="files.o"
--- Src/Aliases/mapfile.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/mapfile.mdd	Thu Jan  6 12:07:21 2000
@@ -1,7 +1,5 @@
 name=mapfile
 
-nozshdep=1
-
 moddeps="zsh/mapfile"
 
 objects="mapfile.o"
--- Src/Aliases/mathfunc.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/mathfunc.mdd	Thu Jan  6 12:07:24 2000
@@ -1,7 +1,5 @@
 name=mathfunc
 
-nozshdep=1
-
 moddeps="zsh/mathfunc"
 
 objects="mathfunc.o"
--- Src/Aliases/parameter.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/parameter.mdd	Thu Jan  6 12:07:27 2000
@@ -1,7 +1,5 @@
 name=parameter
 
-nozshdep=1
-
 moddeps="zsh/parameter"
 
 objects="parameter.o"
--- Src/Aliases/rlimits.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/rlimits.mdd	Thu Jan  6 12:07:31 2000
@@ -1,7 +1,5 @@
 name=rlimits
 
-nozshdep=1
-
 moddeps="zsh/rlimits"
 
 objects="rlimits.o"
--- Src/Aliases/sched.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/sched.mdd	Thu Jan  6 12:07:34 2000
@@ -1,7 +1,5 @@
 name=sched
 
-nozshdep=1
-
 moddeps="zsh/sched"
 
 objects="sched.o"
--- Src/Aliases/stat.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/stat.mdd	Thu Jan  6 12:07:37 2000
@@ -1,7 +1,5 @@
 name=stat
 
-nozshdep=1
-
 moddeps="zsh/stat"
 
 objects="stat.o"
--- Src/Aliases/zftp.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/zftp.mdd	Thu Jan  6 12:07:40 2000
@@ -1,7 +1,5 @@
 name=zftp
 
-nozshdep=1
-
 moddeps="zsh/zftp"
 
 objects="zftp.o"
--- Src/Aliases/zle.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/zle.mdd	Thu Jan  6 12:07:43 2000
@@ -1,7 +1,5 @@
 name=zle
 
-nozshdep=1
-
 moddeps="zsh/zle"
 
 objects="zle.o"
--- Src/Aliases/zleparameter.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/zleparameter.mdd	Thu Jan  6 12:07:47 2000
@@ -1,7 +1,5 @@
 name=zleparameter
 
-nozshdep=1
-
 moddeps="zsh/zleparameter"
 
 objects="zleparameter.o"
--- Src/Aliases/zutil.mdd.bak	Mon Dec 20 21:27:48 1999
+++ Src/Aliases/zutil.mdd	Thu Jan  6 12:07:50 2000
@@ -1,7 +1,5 @@
 name=zutil
 
-nozshdep=1
-
 moddeps="zsh/zutil"
 
 objects="zutil.o"
--- Src/linklist.c.bak	Fri Dec  3 19:10:12 1999
+++ Src/linklist.c	Thu Jan  6 14:04:39 2000
@@ -84,7 +84,7 @@
 /* Insert a list in another list */
 
 /**/
-void
+mod_export void
 insertlinklist(LinkList l, LinkNode where, LinkList x)
 {
     LinkNode nx;
--- Src/mkmakemod.sh.bak	Mon Dec 20 22:08:20 1999
+++ Src/mkmakemod.sh	Thu Jan  6 13:09:31 2000
@@ -188,6 +188,7 @@
 	dobjects=`echo $objects '' | sed 's,\.o ,..o ,g'`
 	modhdeps=
 	exportdeps=
+	imports=
 	q_moddeps=
 	for dep in $moddeps; do
 	    q_dep=`echo $dep | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
@@ -226,6 +227,7 @@
 	    esac
 	    modhdeps="$modhdeps $mdh"
 	    exportdeps="$exportdeps $export"
+	    imports="$imports \$(IMPOPT)$export"
 	done
 
 	echo "##### ===== DEPENDENCIES GENERATED FROM ${mddname}.mdd ===== #####"
@@ -235,7 +237,7 @@
 	echo "SYMS_${mddname} = $proto"
 	echo "EPRO_${mddname} = "`echo $proto '' | sed 's,\.syms ,.epro ,g'`
 	echo "INCS_${mddname} = \$(EPRO_${mddname}) $otherincs"
-	echo "EXPIMP_${mddname} = $exportdeps \$(EXPOPT)$mddname.export"
+	echo "EXPIMP_${mddname} = $imports \$(EXPOPT)$mddname.export"
 	echo "NXPIMP_${mddname} ="
 	echo
 	echo "proto.${mddname}: \$(EPRO_${mddname})"
--- Src/params.c.bak	Thu Jan  6 14:02:58 2000
+++ Src/params.c	Thu Jan  6 14:03:03 2000
@@ -1805,7 +1805,7 @@
 }
 
 /**/
-Param
+mod_export Param
 setiparam(char *s, zlong val)
 {
     Value v;
--- Src/utils.c.bak	Fri Dec  3 19:10:12 1999
+++ Src/utils.c	Thu Jan  6 14:01:38 2000
@@ -2143,7 +2143,7 @@
 }
 
 /**/
-char **
+mod_export char **
 duparray(char **arr, VFunc func)
 {
     if (arr && *arr) {