From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27655 invoked by alias); 24 Aug 2007 11:47:20 -0000 Received: (qmail 27111 invoked by uid 22791); 24 Aug 2007 11:47:16 -0000 X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,DK_POLICY_SIGNSOME,FORGED_RCVD_HELO,HK_OBFDOM,TW_FJ,UPPERCASE_25_50 X-Spam-Check-By: sourceware.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (83.160.170.119) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 24 Aug 2007 11:47:11 +0000 Received: from dijkstra.wildebeest.org ([192.168.1.29]) by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1IOXd4-0003cS-9e; Fri, 24 Aug 2007 13:47:08 +0200 Subject: Re: Again the build is broken :( From: Mark Wielaard To: Kris Van Hees Cc: frysk@sourceware.org In-Reply-To: <1187953952.24666.7.camel@dijkstra.wildebeest.org> References: <20070824055011.GA19064@oracle.com> <1187943385.3749.12.camel@dijkstra.wildebeest.org> <1187953952.24666.7.camel@dijkstra.wildebeest.org> Content-Type: multipart/mixed; boundary="=-LeR18mnIdepR8ODjRqpk" Date: Fri, 24 Aug 2007 11:47:00 -0000 Message-Id: <1187956025.24666.15.camel@dijkstra.wildebeest.org> Mime-Version: 1.0 X-Mailer: Evolution 2.8.3 (2.8.3-2.fc6) X-Spam-Score: -4.3 (----) X-Virus-Checked: Checked by ClamAV on sourceware.org X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2007-q3/txt/msg00338.txt.bz2 --=-LeR18mnIdepR8ODjRqpk Content-Type: text/plain Content-Transfer-Encoding: 7bit Content-length: 1730 Hi, On Fri, 2007-08-24 at 13:12 +0200, Mark Wielaard wrote: > common/Makefile.rules:101: variable `GEN_GCJ_LDADD' is defined but no program or > common/Makefile.rules:101: library has `GEN_GCJ' as canonic name (possible typo) > Makefile.am:40: `common/Makefile.rules' included from here > Problem in directory frysk-imports > ../frysk/autogen.sh: line 57: ../frysk/configure: No such file or directory > > The reason I didn't see it before was that I wasn't doing a full clean > build and there was still an old configure file left. Investigating. OK, found it. automake thinks anything ending in _LDADD is "magic". So a simple change to use a non-magic-sounding variable fixes things: common/ChangeLog 2007-08-24 Mark Wielaard * Makefile.rules: Change GEN_GCJ_LDADD to GEN_GCJ_LDADD_LIST. * Makefile.gen.sh: Likewise. frysk-core/ChangeLog 2007-08-24 Mark Wielaard * Makefile.am: Change GEN_GCJ_LDADD to GEN_GCJ_LDADD_LIST. frysk-gtk/ChangeLog 2007-08-24 Mark Wielaard * Makefile.am: Change GEN_GCJ_LDADD to GEN_GCJ_LDADD_LIST. frysk-gui/ChangeLog 2007-08-24 Mark Wielaard * Makefile.am: Change GEN_GCJ_LDADD to GEN_GCJ_LDADD_LIST. frysk-imports/ChangeLog 2007-08-24 Mark Wielaard * Makefile.am: Change GEN_GCJ_LDADD to GEN_GCJ_LDADD_LIST. frysk-sys/ChangeLog 2007-08-24 Mark Wielaard * Makefile.am: Change GEN_GCJ_LDADD to GEN_GCJ_LDADD_LIST. Tested on FC6 with automake 1.9.6 and F7 with automake 1.10. I don't know why this wasn't a problem before the removal of fryski though. So some extra testing is appreciated. Cheers, Mark --=-LeR18mnIdepR8ODjRqpk Content-Disposition: inline; filename=ldadd_list.patch Content-Type: text/x-patch; name=ldadd_list.patch; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 12880 Index: frysk-core/Makefile.am =================================================================== RCS file: /cvs/frysk/frysk-core/Makefile.am,v retrieving revision 1.116 diff -u -r1.116 Makefile.am --- frysk-core/Makefile.am 16 Aug 2007 19:22:33 -0000 1.116 +++ frysk-core/Makefile.am 24 Aug 2007 11:29:25 -0000 @@ -51,26 +51,26 @@ GEN_CLASSPATH += ../frysk-imports/getopt.jar GEN_CLASSPATH += ../frysk-imports/jdom.jar GEN_CLASSPATH += ../frysk-imports/cdtparser.jar -GEN_GCJ_LDADD += ../frysk-sys/libfrysk-sys.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jline.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-antlr.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-getopt.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jdom.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-cdtparser.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a +GEN_GCJ_LDADD_LIST += ../frysk-sys/libfrysk-sys.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jline.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-antlr.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jdom.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-cdtparser.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a if USE_LIBUNWIND -GEN_GCJ_LDADD += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ +GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ ../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \ ../frysk-imports/libunwind-ppc64/src/.libs/libunwind-ppc64.a endif -GEN_GCJ_LDADD += -lstdc++ +GEN_GCJ_LDADD_LIST += -lstdc++ # Stub bfd_getb32 and bfd_getl32 for PPC64. Unconditionally # link -lbfd_get just for simplification. -GEN_GCJ_LDADD += -laudit +GEN_GCJ_LDADD_LIST += -laudit # For TestExec.java pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias Index: frysk-gtk/Makefile.am =================================================================== RCS file: /cvs/frysk/frysk-gtk/Makefile.am,v retrieving revision 1.38 diff -u -r1.38 Makefile.am --- frysk-gtk/Makefile.am 16 Aug 2007 19:22:34 -0000 1.38 +++ frysk-gtk/Makefile.am 24 Aug 2007 11:29:25 -0000 @@ -48,22 +48,22 @@ GEN_CLASSPATH += ../frysk-imports/getopt.jar GEN_CLASSPATH += $(FRYSK_GTK_JARS) -GEN_GCJ_LDADD += ../frysk-sys/libfrysk-sys.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-getopt.a -GEN_GCJ_LDADD += $(FRYSK_GTK_LIBS) -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a +GEN_GCJ_LDADD_LIST += ../frysk-sys/libfrysk-sys.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a +GEN_GCJ_LDADD_LIST += $(FRYSK_GTK_LIBS) +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a if USE_LIBUNWIND -GEN_GCJ_LDADD += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ +GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ ../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \ ../frysk-imports/libunwind-ppc64/src/.libs/libunwind-ppc64.a endif -GEN_GCJ_LDADD += -lstdc++ +GEN_GCJ_LDADD_LIST += -lstdc++ # For auditing -GEN_GCJ_LDADD += -laudit +GEN_GCJ_LDADD_LIST += -laudit # Hack, need to compile this entire sub-tree with JNI. AM_GCJFLAGS += -fjni Index: frysk-gui/Makefile.am =================================================================== RCS file: /cvs/frysk/frysk-gui/Makefile.am,v retrieving revision 1.98 diff -u -r1.98 Makefile.am --- frysk-gui/Makefile.am 16 Aug 2007 19:22:34 -0000 1.98 +++ frysk-gui/Makefile.am 24 Aug 2007 11:29:25 -0000 @@ -54,30 +54,30 @@ GEN_CLASSPATH += $(FRYSK_GUI_JARS) GEN_CLASSPATH += /usr/lib -GEN_GCJ_LDADD += ../frysk-gtk/libfrysk-gtk.a -GEN_GCJ_LDADD += ../frysk-core/libfrysk-core.a -GEN_GCJ_LDADD += ../frysk-sys/libfrysk-sys.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-antlr.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jdom.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-cdtparser.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-getopt.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jline.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a +GEN_GCJ_LDADD_LIST += ../frysk-gtk/libfrysk-gtk.a +GEN_GCJ_LDADD_LIST += ../frysk-core/libfrysk-core.a +GEN_GCJ_LDADD_LIST += ../frysk-sys/libfrysk-sys.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-antlr.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jdom.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-cdtparser.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jline.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a if USE_LIBUNWIND -GEN_GCJ_LDADD += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ +GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ ../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \ ../frysk-imports/libunwind-ppc64/src/.libs/libunwind-ppc64.a endif -GEN_GCJ_LDADD += -lstdc++ -GEN_GCJ_LDADD += ../frysk-gtk/libfrysk-ftk.a -GEN_GCJ_LDADD += -L../frysk-gtk/EggTrayIcon -GEN_GCJ_LDADD += -L../frysk-gtk/tlwidgets -GEN_GCJ_LDADD += $(FRYSK_GUI_LIBS) -GEN_GCJ_LDADD += -laudit +GEN_GCJ_LDADD_LIST += -lstdc++ +GEN_GCJ_LDADD_LIST += ../frysk-gtk/libfrysk-ftk.a +GEN_GCJ_LDADD_LIST += -L../frysk-gtk/EggTrayIcon +GEN_GCJ_LDADD_LIST += -L../frysk-gtk/tlwidgets +GEN_GCJ_LDADD_LIST += $(FRYSK_GUI_LIBS) +GEN_GCJ_LDADD_LIST += -laudit # Skip the JUnit tests (exit with status 77) when there is no display; bug #3012. #TESTS_ENVIRONMENT = ( test $$tst != TestRunner || test -n "$$DISPLAY" || exit 77 ) && Index: frysk-imports/Makefile.am =================================================================== RCS file: /cvs/frysk/frysk-imports/Makefile.am,v retrieving revision 1.92 diff -u -r1.92 Makefile.am --- frysk-imports/Makefile.am 16 Aug 2007 19:22:34 -0000 1.92 +++ frysk-imports/Makefile.am 24 Aug 2007 11:29:25 -0000 @@ -71,18 +71,18 @@ GEN_CLASSPATH += getopt.jar GEN_CLASSPATH += junit.jar -GEN_GCJ_LDADD += libfrysk-getopt.a -GEN_GCJ_LDADD += libfrysk-junit.a -GEN_GCJ_LDADD += ./elfutils/libdwfl/libdwfl.a -GEN_GCJ_LDADD += ./elfutils/libdw/libdw.a -GEN_GCJ_LDADD += ./elfutils/libebl/libebl.a -GEN_GCJ_LDADD += ./elfutils/libelf/libelf.a -GEN_GCJ_LDADD += -lstdc++ -GEN_GCJ_LDADD += ./libunwind-i386/src/.libs/libunwind-x86.a -GEN_GCJ_LDADD += ./libunwind-x86_64/src/.libs/libunwind-x86_64.a -GEN_GCJ_LDADD += ./libunwind-ppc64/src/.libs/libunwind-ppc64.a +GEN_GCJ_LDADD_LIST += libfrysk-getopt.a +GEN_GCJ_LDADD_LIST += libfrysk-junit.a +GEN_GCJ_LDADD_LIST += ./elfutils/libdwfl/libdwfl.a +GEN_GCJ_LDADD_LIST += ./elfutils/libdw/libdw.a +GEN_GCJ_LDADD_LIST += ./elfutils/libebl/libebl.a +GEN_GCJ_LDADD_LIST += ./elfutils/libelf/libelf.a +GEN_GCJ_LDADD_LIST += -lstdc++ +GEN_GCJ_LDADD_LIST += ./libunwind-i386/src/.libs/libunwind-x86.a +GEN_GCJ_LDADD_LIST += ./libunwind-x86_64/src/.libs/libunwind-x86_64.a +GEN_GCJ_LDADD_LIST += ./libunwind-ppc64/src/.libs/libunwind-ppc64.a # For auding of system calls. -GEN_GCJ_LDADD += -laudit +GEN_GCJ_LDADD_LIST += -laudit # Need to get this into the distribution noinst_HEADERS = \ Index: frysk-sys/Makefile.am =================================================================== RCS file: /cvs/frysk/frysk-sys/Makefile.am,v retrieving revision 1.35 diff -u -r1.35 Makefile.am --- frysk-sys/Makefile.am 16 Aug 2007 19:22:34 -0000 1.35 +++ frysk-sys/Makefile.am 24 Aug 2007 11:29:25 -0000 @@ -49,19 +49,19 @@ GEN_CLASSPATH += ../frysk-imports/getopt.jar GEN_CLASSPATH += ../frysk-imports/jdom.jar GEN_CLASSPATH += ../frysk-imports/cdtparser.jar -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jline.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-antlr.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-junit.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-getopt.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-jdom.a -GEN_GCJ_LDADD += ../frysk-imports/libfrysk-cdtparser.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdwfl/libdwfl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libdw/libdw.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libebl/libebl.a -GEN_GCJ_LDADD += ../frysk-imports/elfutils/libelf/libelf.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jline.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-antlr.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-junit.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-getopt.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-jdom.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/libfrysk-cdtparser.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdwfl/libdwfl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libdw/libdw.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libebl/libebl.a +GEN_GCJ_LDADD_LIST += ../frysk-imports/elfutils/libelf/libelf.a if USE_LIBUNWIND -GEN_GCJ_LDADD += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ +GEN_GCJ_LDADD_LIST += ../frysk-imports/libunwind-i386/src/.libs/libunwind-x86.a \ ../frysk-imports/libunwind-x86_64/src/.libs/libunwind-x86_64.a \ ../frysk-imports/libunwind-ppc64/src/.libs/libunwind-ppc64.a endif -GEN_GCJ_LDADD += -lstdc++ -laudit \ No newline at end of file +GEN_GCJ_LDADD_LIST += -lstdc++ -laudit Index: common/Makefile.gen.sh =================================================================== RCS file: /cvs/frysk/frysk-common/Makefile.gen.sh,v retrieving revision 1.157 diff -u -r1.157 Makefile.gen.sh --- common/Makefile.gen.sh 19 Jul 2007 20:32:08 -0000 1.157 +++ common/Makefile.gen.sh 24 Aug 2007 11:29:25 -0000 @@ -408,7 +408,7 @@ noinst_LIBRARIES += lib${GEN_DIRNAME}.a ${sources} = ${nodist_lib_sources} = -GEN_GCJ_LDADD += lib${GEN_DIRNAME}.a +GEN_GCJ_LDADD_LIST += lib${GEN_DIRNAME}.a # Compile the .a into a .so; Makefile.rules contains the rule and does # not use libtool. @@ -444,7 +444,7 @@ CLEANFILES += TestRunner.java ${nodist_lib_sources} += ${GEN_SOURCENAME}/JUnitTests.java BUILT_SOURCES += ${GEN_SOURCENAME}/JUnitTests.java -TestRunner_LDADD = \${LIBJUNIT} \${GEN_GCJ_LDADD} +TestRunner_LDADD = \${LIBJUNIT} \${GEN_GCJ_LDADD_LIST} TESTS += TestRunner noinst_PROGRAMS += TestRunner EOF @@ -491,7 +491,7 @@ echo "${name_}_SOURCES =" echo "${name_}_LINK = \$(GCJLINK) \$(${name_}_LDFLAGS)" echo_LDFLAGS ${name} - echo "${name_}_LDADD = \$(GEN_GCJ_LDADD)" + echo "${name_}_LDADD = \$(GEN_GCJ_LDADD_LIST)" fi done || exit 1 done Index: common/Makefile.rules =================================================================== RCS file: /cvs/frysk/frysk-common/Makefile.rules,v retrieving revision 1.242 diff -u -r1.242 Makefile.rules --- common/Makefile.rules 24 Aug 2007 01:38:15 -0000 1.242 +++ common/Makefile.rules 24 Aug 2007 11:29:25 -0000 @@ -96,9 +96,9 @@ # The list of libraries for the GCJ programs is different to that of # the standalone .c programs. Accumulate the GCJ list in -# GEN_GCJ_LDADD. +# GEN_GCJ_LDADD_LIST. -GEN_GCJ_LDADD = +GEN_GCJ_LDADD_LIST = # Take the LDADD list and transform it into a dynamic shared library # list. This can then, in turn be converted into an in-build-tree @@ -107,7 +107,7 @@ # Convert LDADD's .a into -L -llib GEN_GCJ_SO_FLAGS = \ - $(foreach lib, $(GEN_GCJ_LDADD), \ + $(foreach lib, $(GEN_GCJ_LDADD_LIST), \ $(if $(filter -L%,$(lib)), $(lib)) \ $(if $(filter -l%,$(lib)), $(lib)) \ $(if $(filter %.a,$(lib)), \ --=-LeR18mnIdepR8ODjRqpk--