From marcs@alive.ampr.ab.ca Fri Oct 11 15:44:50 1996 Received: from scanner.worldgate.com (scanner.worldgate.com [198.161.84.3]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id PAA02007 for ; Fri, 11 Oct 1996 15:44:48 -0700 (PDT) Received: from alive.ampr.ab.ca (uucp@localhost) by scanner.worldgate.com (8.7.5/8.7.3) with UUCP id QAA28324 for FreeBSD-gnats-submit@freebsd.org; Fri, 11 Oct 1996 16:44:36 -0600 (MDT) Received: (from marcs@localhost) by alive.ampr.ab.ca (8.7.5/8.7.3) id QAA22348; Fri, 11 Oct 1996 16:43:48 -0600 (MDT) Message-Id: <199610112243.QAA22348@alive.ampr.ab.ca> Date: Fri, 11 Oct 1996 16:43:48 -0600 (MDT) From: marcs@znep.com Reply-To: marcs@znep.com To: FreeBSD-gnats-submit@freebsd.org Subject: sysinstall doesn't compile in -stable X-Send-Pr-Version: 3.2 >Number: 1776 >Category: bin >Synopsis: sysinstall won't compile in -stable >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Oct 11 15:50:02 PDT 1996 >Closed-Date: Fri Oct 18 18:51:47 PDT 1996 >Last-Modified: Fri Oct 18 18:52:13 PDT 1996 >Originator: Marc Slemko >Release: FreeBSD 2.1-STABLE i386 >Organization: >Environment: A -stable source tree checked out from CVS using RELENG_2_1_0 as a tag. The rest of the system is running the latest -stable. >Description: A function in options.c is defined with the wrong case, so it won't compile. This looks like it is either a result of some changes made to -current not making it back into -stable when they should, or some changes made to -current making it back into -stable when they shouldn't. >How-To-Repeat: cvs checkout -r RELENG_2_1_0 sysinstall cd sysinstall make gcc will stop in options.c with the error: options.c:114: `mediaSetFTPUserPass' undeclared here (not in a function) options.c:114: initializer element for `Options.data' is not constant *** Error code 1 >Fix: The following patch is one fix to the problem, but the real fix may be different depending on what the intent was. Index: options.c =================================================================== RCS file: /usr/cvs/src/release/sysinstall/options.c,v retrieving revision 1.44 diff -c -r1.44 options.c *** options.c 1996/10/02 01:30:37 1.44 --- options.c 1996/10/11 22:39:22 *************** *** 111,117 **** { "Yes to All", "Assume \"Yes\" answers to all non-critical dialogs", OPT_IS_VAR, NULL, VAR_NO_CONFIRM, varCheck }, { "FTP username", "Username and password to use instead of anonymous", ! OPT_IS_FUNC, mediaSetFTPUserPass, VAR_FTP_USER, varCheck }, { "Editor", "Which text editor to use during installation", OPT_IS_VAR, EDITOR_PROMPT, VAR_EDITOR, varCheck }, { "Tape Blocksize", "Tape media block size in 512 byte blocks", --- 111,117 ---- { "Yes to All", "Assume \"Yes\" answers to all non-critical dialogs", OPT_IS_VAR, NULL, VAR_NO_CONFIRM, varCheck }, { "FTP username", "Username and password to use instead of anonymous", ! OPT_IS_FUNC, mediaSetFtpUserPass, VAR_FTP_USER, varCheck }, { "Editor", "Which text editor to use during installation", OPT_IS_VAR, EDITOR_PROMPT, VAR_EDITOR, varCheck }, { "Tape Blocksize", "Tape media block size in 512 byte blocks", >Release-Note: >Audit-Trail: From: "Jordan K. Hubbard" To: marcs@znep.com Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: bin/1776: sysinstall doesn't compile in -stable Date: Fri, 11 Oct 1996 17:05:44 -0700 I'm going to do another merge soon, so this probably isn't worth fixing as-such. If you can hold off for another week or so, it'll all be updated in one go. Jordan State-Changed-From-To: open->closed State-Changed-By: jkh State-Changed-When: Fri Oct 18 18:51:47 PDT 1996 State-Changed-Why: Fixed as of 2.2-961014-SNAP. >Unformatted: