From owner-freebsd-isdn Sat Nov 28 12:51:22 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id MAA13013 for freebsd-isdn-outgoing; Sat, 28 Nov 1998 12:51:22 -0800 (PST) (envelope-from owner-freebsd-isdn@FreeBSD.ORG) Received: from foobar.franken.de (foobar.franken.de [194.94.249.81]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id MAA13005 for ; Sat, 28 Nov 1998 12:51:15 -0800 (PST) (envelope-from logix@foobar.franken.de) Received: (from logix@localhost) by foobar.franken.de (8.8.8/8.8.5) id VAA05016; Sat, 28 Nov 1998 21:50:28 +0100 (CET) Message-ID: <19981128215027.A4989@foobar.franken.de> Date: Sat, 28 Nov 1998 21:50:27 +0100 From: Harold Gutch To: Jon Johansen , freebsd-isdn@FreeBSD.ORG Subject: Re: Problem with i4b and freebsd3.0, please help. References: <001901be1b01$09776750$640064a0@jon> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.93.2i In-Reply-To: <001901be1b01$09776750$640064a0@jon>; from Jon Johansen on Sat, Nov 28, 1998 at 07:58:07PM +0100 X-Organisation: BatmanSystemDistribution X-Mission: To free the world from the Penguin Sender: owner-freebsd-isdn@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org On Sat, Nov 28, 1998 at 07:58:07PM +0100, Jon Johansen wrote: > I'm using FreeBSD 3.0 and I'm having some trouble > with installing isdn4freebsd. I applied the paches. etc > that freebsd 3.0 users must apply (as stated in FreeBSD/INSTALLATION). > In FreeBSD/ i run 'sh install.sh', which runs fine. Then I 'cd ..' and > do a make depend (which runs fine), and then 'make' which doesn't run fine. > It says it cant find the file 'y.tab.h' so I search my hd for the file > and I find it in '/usr/src/bin/sh/y.tab.h' and I copy it to '/usr/src/ > i4b/isdnd'. Then I do a 'make' again, it doesn't come up with the error, > but it comes ut with several new ones: > The following was sent to the list quite a while ago: From: Wolfgang Helbig Message-Id: <199805091103.NAA00483@rvc1.informatik.ba-stuttgart.de> Subject: i4b-00.60-alpha for FreeBSD-current To: FreeBSD-ISDN@FreeBSD.ORG (FreeBSD ISDN mailinglist) Date: Sat, 9 May 1998 13:03:04 +0200 (MET DST) X-Mailer: ELM [version 2.4ME+ PL30 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-isdn@FreeBSD.ORG X-Loop: FreeBSD.org Status: RO Content-Length: 3129 Lines: 101 Hi, here are some patches to make i4b build for FreeBSD-current: - Bruce Evans changed yacc and lex rules in bsd-prog-mk, which broke isdnd/Makefile Don't forget ``make depend''. - asm volatile is not valid anymore in the current gcc-configuration, use __asm __volatile instead in i4b_tel_s08.c and i4b_tel_s16.c This patch should work in FreeBSD 2.2.x and NetBSD as well?? - A typo in i4b_l1fsm.c. With these patches applied it builds and works fine. Wolfgang diff -ru /home/helbig/src/i4b/isdnd/Makefile ./isdnd/Makefile --- /home/helbig/src/i4b/isdnd/Makefile Wed Apr 22 11:47:12 1998 +++ ./isdnd/Makefile Sat May 9 11:35:39 1998 @@ -1,14 +1,26 @@ +.if !defined(BSDTYPE) +BSDTYPE!=uname +.endif + +.if !defined(RELEASE) +RELEASE!=uname -r +.endif + PROG = isdnd SRCS = rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \ process.c rates.c msghdl.c fsm.c support.c timer.c \ exec.c dial.c monitor.c +.if (${BSDTYPE} == "FreeBSD" && ${RELEASE} == "3.0-CURRENT") +SRCS += y.tab.h +.endif + +.if (${BSDTYPE} == "NetBSD" || \ + ${BSDTYPE} == "FreeBSD" && ${RELEASE} != "3.0-CURRENT") CLEANFILES+= rc_scan.c rc_parse.c y.tab.h y.output hdr.out isdnd.core +.endif COPTS += -I../isdnmonitor -.if !defined(BSDTYPE) -BSDTYPE!=uname -.endif # compile debug support COPTS += -DDEBUG @@ -28,10 +40,13 @@ MAN = isdnd.8 isdnd.rc.5 isdnd.rates.5 isdnd.acct.5 .endif +.if (${BSDTYPE} == "NetBSD" || \ + ${BSDTYPE} == "FreeBSD" && ${RELEASE} != "3.0-CURRENT") rc_scan.c: rc_scan.l y.tab.h y.tab.h: rc_parse.c rc_parse.c: rc_parse.y rc_config.c: y.tab.h +.endif hdr: cextract +A +p -P -E -o hdr.out *.c diff -ru /home/helbig/src/i4b/layer1/i4b_l1fsm.c ./layer1/i4b_l1fsm.c --- /home/helbig/src/i4b/layer1/i4b_l1fsm.c Fri May 1 19:23:33 1998 +++ ./layer1/i4b_l1fsm.c Sat May 9 12:13:14 1998 @@ -171,7 +171,7 @@ { sc->sc_I430T3 = 0; #if defined(__FreeBSD__) && __FreeBSD__ >=3 - untimeout((TIMEOUT_FUNC_T)timer3_expired,(struct isic_softc *)sc, T3_callout); + untimeout((TIMEOUT_FUNC_T)timer3_expired,(struct isic_softc *)sc, sc->sc_T3_callout); #else untimeout((TIMEOUT_FUNC_T)timer3_expired,(struct isic_softc *)sc); #endif diff -ru /home/helbig/src/i4b/layer1/i4b_tel_s016.c ./layer1/i4b_tel_s016.c --- /home/helbig/src/i4b/layer1/i4b_tel_s016.c Mon Mar 2 09:42:51 1998 +++ ./layer1/i4b_tel_s016.c Sat May 9 12:07:29 1998 @@ -170,7 +170,7 @@ tels016_memcpyb(void *to, const void *from, size_t len) { /* %edi=to %esi=from %ecx=len */ - asm volatile (" + __asm __volatile (" .align 4,0x90 cld rep diff -ru /home/helbig/src/i4b/layer1/i4b_tel_s08.c ./layer1/i4b_tel_s08.c --- /home/helbig/src/i4b/layer1/i4b_tel_s08.c Tue Apr 21 17:57:20 1998 +++ ./layer1/i4b_tel_s08.c Sat May 9 12:07:50 1998 @@ -169,7 +169,7 @@ tels08_memcpyb(void *to, const void *from, size_t len) { /* %edi=to %esi=from %ecx=len */ - asm volatile (" + __asm __volatile (" .align 4,0x90 cld rep To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message -- bye, logix Sleep is an abstinence syndrome wich occurs due to lack of caffein. Wed Mar 4 04:53:33 CET 1998 #unix, ircnet To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-isdn" in the body of the message