Date: Wed, 20 Mar 2002 23:09:39 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8130 for review Message-ID: <200203210709.g2L79df26145@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8130 Change 8130 by peter@peter_overcee on 2002/03/20 23:09:15 turn off NOSHARED, it causes library breakage due to "debug" being defined in too many places Affected files ... ... //depot/projects/ia64/contrib/lukemftpd/src/extern.h#3 edit ... //depot/projects/ia64/contrib/opie/libopie/writerec.c#2 edit ... //depot/projects/ia64/libexec/Makefile#3 edit ... //depot/projects/ia64/libexec/lukemftpd/Makefile#2 edit ... //depot/projects/ia64/secure/libexec/telnetd/Makefile#5 edit ... //depot/projects/ia64/share/mk/bsd.sys.mk#3 edit ... //depot/projects/ia64/sys/ia64/conf/GENERIC#6 edit ... //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#2 edit ... //depot/projects/ia64/sys/ia64/conf/SMALL#9 edit Differences ... ==== //depot/projects/ia64/contrib/lukemftpd/src/extern.h#3 (text+ko) ==== @@ -100,6 +100,9 @@ * SUCH DAMAGE. */ +#include <sys/param.h> +#include <setjmp.h> + #ifdef NO_LONG_LONG # define LLF "%ld" # define LLFP(x) "%" x "ld" ==== //depot/projects/ia64/contrib/opie/libopie/writerec.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #endif /* HAVE_STDLIB_H */ #include "opie.h" -char *__opienone = "****************"; +static char *__opienone = "****************"; int __opiewriterec FUNCTION((opie), struct opie *opie) { ==== //depot/projects/ia64/libexec/Makefile#3 (text+ko) ==== @@ -9,7 +9,6 @@ ftpd \ getNAME \ getty \ - lukemftpd \ makekey \ mknetid \ pppoed \ ==== //depot/projects/ia64/libexec/lukemftpd/Makefile#2 (text+ko) ==== @@ -11,7 +11,7 @@ SRCS= cmds.c conf.c ftpd.c ftpcmd.y popen.c WFORMAT= 0 -CFLAGS+= -I${.CURDIR} -I${LUKEMFTPD} #-I${LUKEMFTPD}/src +CFLAGS+= -I${.CURDIR} -I${LUKEMFTPD} -I${LUKEMFTPD}/src YFLAGS= LDADD= -lmd -lcrypt -lutil ==== //depot/projects/ia64/secure/libexec/telnetd/Makefile#5 (text+ko) ==== @@ -3,7 +3,6 @@ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. -NOSHARED= xx PROG= telnetd MAN= telnetd.8 ==== //depot/projects/ia64/share/mk/bsd.sys.mk#3 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#6 (text+ko) ==== @@ -27,7 +27,7 @@ maxusers 0 #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" +hints "GENERIC.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_CPU_COPTFLAGS=true #Ignore any x86 CPUTYPE @@ -59,6 +59,7 @@ # SMP options SMP + # Debugging for use in -current options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking @@ -69,6 +70,10 @@ device isa device pci +# IA64 uses acpica +device acpica +options ACPI_DEBUG + # Floppy drives device fdc ==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#2 (text+ko) ==== @@ -11,8 +11,8 @@ hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -hint.vga.0.at="isa" -hint.sc.0.at="isa" +#hint.vga.0.at="isa" +#hint.sc.0.at="isa" hint.mcclock.0.at="isa" hint.mcclock.0.port="0x70" hint.sio.0.at="isa" ==== //depot/projects/ia64/sys/ia64/conf/SMALL#9 (text+ko) ==== @@ -135,12 +135,12 @@ device bpf #Berkeley packet filter # USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard +#device uhci # UHCI PCI->USB interface +#device ohci # OHCI PCI->USB interface +#device usb # USB Bus (required) +#device ugen # Generic +#device uhid # "Human Interface Devices" +#device ukbd # Keyboard #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da0 #device ums # Mouse To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203210709.g2L79df26145>