From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 855 invoked by alias); 30 Jun 2005 16:04:17 -0000 Mailing-List: contact sid-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: sid-owner@sources.redhat.com Received: (qmail 764 invoked by uid 22791); 30 Jun 2005 16:04:06 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Thu, 30 Jun 2005 16:04:06 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j5UG44KZ006229 for ; Thu, 30 Jun 2005 12:04:04 -0400 Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com [172.16.14.4]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j5UG3xu14392; Thu, 30 Jun 2005 12:03:59 -0400 Received: from [172.16.14.227] (IDENT:3Y1ESIGv+LvUSd+EIFQOQESqc7fGQpZR@topaz.toronto.redhat.com [172.16.14.227]) by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id j5UG3x1M002154; Thu, 30 Jun 2005 12:03:59 -0400 Message-ID: <42C417EE.2060204@redhat.com> Date: Thu, 30 Jun 2005 16:04:00 -0000 From: Dave Brolley User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050317) MIME-Version: 1.0 To: Michael Torbett CC: sid@sources.redhat.com Subject: Re: recent CVS snapshots of SID are broken References: <42C30AC4.4060208@savaje.com> In-Reply-To: <42C30AC4.4060208@savaje.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2005-q2/txt/msg00053.txt.bz2 In each case, the original definition and the (supposed) multiple definition are on the same line and source file. The problem appears to be that sid-bochs-memory.cc is listed twice in libmemory_la_SOURCES in sid/component/bochs/cpu/memory/Makefile.am. I've commited thet following patch. Dave 2005-06-30 Dave Brolley * cpu/memory/Makefile.am (libmemory_la_SOURCES): Remove duplicate sid-bochs-memory.cc * cpu/memory/Makefile.in: Regenerate. Index: Makefile.am =================================================================== RCS file: /cvs/src/src/sid/component/bochs/cpu/memory/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -c -p -r1.1 -r1.2 *** Makefile.am 15 Feb 2002 01:18:46 -0000 1.1 --- Makefile.am 30 Jun 2005 16:00:03 -0000 1.2 *************** INCLUDES = -I$(top_builddir)/../../inclu *** 6,11 **** noinst_LTLIBRARIES = libmemory.la ! libmemory_la_SOURCES = sid-bochs-memory.cc sid-bochs-memory.cc libmemory_la_LDFLAGS = -no-undefined --- 6,11 ---- noinst_LTLIBRARIES = libmemory.la ! libmemory_la_SOURCES = sid-bochs-memory.cc libmemory_la_LDFLAGS = -no-undefined Index: Makefile.in =================================================================== RCS file: /cvs/src/src/sid/component/bochs/cpu/memory/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -c -p -r1.3 -r1.4 *** Makefile.in 4 Jun 2005 03:22:58 -0000 1.3 --- Makefile.in 30 Jun 2005 16:00:03 -0000 1.4 *************** CONFIG_HEADER = $(top_builddir)/config.h *** 49,55 **** CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libmemory_la_LIBADD = ! am_libmemory_la_OBJECTS = sid-bochs-memory.lo sid-bochs-memory.lo libmemory_la_OBJECTS = $(am_libmemory_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../config/depcomp --- 49,55 ---- CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libmemory_la_LIBADD = ! am_libmemory_la_OBJECTS = sid-bochs-memory.lo libmemory_la_OBJECTS = $(am_libmemory_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../config/depcomp *************** target_alias = @target_alias@ *** 240,246 **** AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_builddir)/../../include -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../../../include noinst_LTLIBRARIES = libmemory.la ! libmemory_la_SOURCES = sid-bochs-memory.cc sid-bochs-memory.cc libmemory_la_LDFLAGS = -no-undefined all: all-am --- 240,246 ---- AUTOMAKE_OPTIONS = foreign INCLUDES = -I$(top_builddir)/../../include -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../../../include noinst_LTLIBRARIES = libmemory.la ! libmemory_la_SOURCES = sid-bochs-memory.cc libmemory_la_LDFLAGS = -no-undefined all: all-am