* [patch] Fix opcode/Makefile.am
@ 2007-07-06 14:09 Mark Kettenis
2007-07-06 14:41 ` H.J. Lu
0 siblings, 1 reply; 2+ messages in thread
From: Mark Kettenis @ 2007-07-06 14:09 UTC (permalink / raw)
To: binutils
Building libopcodes on OpenBSD with the native (non-GNU) make fails
right now. It is fairly easy to fix, by prepending $(srcdir)/ to the
appropriate targets, like we already do for most of them.
Unfortunately I can't seem to regenerate Makefile.in, because automake
(I tried both 1.9.6 and 1.9.2) barfs:
Use of uninitialized value in string eq at /usr/local/bin/automake-1.9 line 4673, <GEN0> line 1.
Use of uninitialized value in exists at /usr/local/bin/automake-1.9 line 4675, <GEN0> line 1.
Use of uninitialized value in concatenation (.) or string at /usr/local/bin/automake-1.9 line 4675, <GEN0> line 1.
automake-1.9: ####################
automake-1.9: ## Internal Error ##
automake-1.9: ####################
automake-1.9: unrequested trace `'
automake-1.9: Please contact <bug-automake@gnu.org>.
at /usr/local/share/automake-1.9/Automake/Channels.pm line 562
Automake::Channels::msg('automake', '', 'unrequested trace `\'') called at /usr/local/share/automake-1.9/Automake/ChannelDefs.pm line 191
Automake::ChannelDefs::prog_error('unrequested trace `\'') called at /usr/local/bin/automake-1.9 line 4675
Automake::scan_autoconf_traces('configure.in') called at /usr/local/bin/automake-1.9 line 4877
Automake::scan_autoconf_files() called at /usr/local/bin/automake-1.9 line 7493
Are people seeing the same thing on their systems?
Assuming this is a local problem (perhaps it's related to my version
of perl), I'd appreciate it if someone could do that for me and commit
this. Alternatively I could patch Makefile.in by hand (like I've done
in my local tree).
Index: ChangeLog
from Mark Kettenis <kettenis@gnu.org>
* Makefile.am: Add $(srcdir) to targets that need it.
* Makefile.in: Regenerate.
Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.115
diff -u -p -r1.115 Makefile.am
--- Makefile.am 2 Jul 2007 07:12:52 -0000 1.115
+++ Makefile.am 6 Jul 2007 13:35:18 -0000
@@ -575,7 +575,7 @@ i386-gen: i386-gen.o
i386-gen.o: i386-gen.c i386-opc.h
-i386-tbl.h: @MAINT@ i386-gen i386-opc.tbl i386-reg.tbl
+$(srcdir)/i386-tbl.h: @MAINT@ i386-gen i386-opc.tbl i386-reg.tbl
./i386-gen --srcdir $(srcdir) > $(srcdir)/i386-tbl.h
ia64-gen: ia64-gen.o
@@ -584,7 +584,7 @@ ia64-gen: ia64-gen.o
ia64-gen.o: ia64-gen.c ia64-opc.c ia64-opc-a.c ia64-opc-b.c ia64-opc-f.c \
ia64-opc-i.c ia64-opc-m.c ia64-opc-d.c ia64-opc.h
-ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.tbl
+$(srcdir)/ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.tbl
./ia64-gen --srcdir $(srcdir) > $(srcdir)/ia64-asmtab.c
s390-mkopc: s390-mkopc.c
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch] Fix opcode/Makefile.am
2007-07-06 14:09 [patch] Fix opcode/Makefile.am Mark Kettenis
@ 2007-07-06 14:41 ` H.J. Lu
0 siblings, 0 replies; 2+ messages in thread
From: H.J. Lu @ 2007-07-06 14:41 UTC (permalink / raw)
To: Mark Kettenis; +Cc: binutils
On Fri, Jul 06, 2007 at 03:43:29PM +0200, Mark Kettenis wrote:
> Building libopcodes on OpenBSD with the native (non-GNU) make fails
> right now. It is fairly easy to fix, by prepending $(srcdir)/ to the
> appropriate targets, like we already do for most of them.
>
> Assuming this is a local problem (perhaps it's related to my version
> of perl), I'd appreciate it if someone could do that for me and commit
> this. Alternatively I could patch Makefile.in by hand (like I've done
> in my local tree).
>
>
> Index: ChangeLog
> from Mark Kettenis <kettenis@gnu.org>
>
> * Makefile.am: Add $(srcdir) to targets that need it.
> * Makefile.in: Regenerate.
I am checking in the following patch. Tested for Linux/x86-64 and
Linux/ia64. "make i386-tbl.h" and "make ia64-asmtab.c" still work.
H.J.
---
2007-07-06 Mark Kettenis <kettenis@gnu.org>
H.J. Lu <hongjiu.lu@intel.com>
* Makefile.am (i386-tbl.h): Add $(srcdir)/ to target.
(ia64-asmtab.c): Likewise.
* Makefile.in: Regenerate.
--- opcodes/Makefile.am.gen 2007-07-02 06:54:30.000000000 -0700
+++ opcodes/Makefile.am 2007-07-06 07:29:43.000000000 -0700
@@ -575,8 +575,8 @@ i386-gen: i386-gen.o
i386-gen.o: i386-gen.c i386-opc.h
-i386-tbl.h: @MAINT@ i386-gen i386-opc.tbl i386-reg.tbl
- ./i386-gen --srcdir $(srcdir) > $(srcdir)/i386-tbl.h
+$(srcdir)/i386-tbl.h: @MAINT@ i386-gen i386-opc.tbl i386-reg.tbl
+ ./i386-gen --srcdir $(srcdir) > $@
ia64-gen: ia64-gen.o
$(LINK) ia64-gen.o $(LIBIBERTY)
@@ -584,8 +584,9 @@ ia64-gen: ia64-gen.o
ia64-gen.o: ia64-gen.c ia64-opc.c ia64-opc-a.c ia64-opc-b.c ia64-opc-f.c \
ia64-opc-i.c ia64-opc-m.c ia64-opc-d.c ia64-opc.h
-ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.tbl
- ./ia64-gen --srcdir $(srcdir) > $(srcdir)/ia64-asmtab.c
+$(srcdir)/ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl \
+ ia64-waw.tbl ia64-war.tbl
+ ./ia64-gen --srcdir $(srcdir) > $@
s390-mkopc: s390-mkopc.c
$(CC_FOR_BUILD) -o s390-mkopc $(srcdir)/s390-mkopc.c
--- opcodes/Makefile.in.gen 2007-07-05 06:20:58.000000000 -0700
+++ opcodes/Makefile.in 2007-07-06 07:29:53.000000000 -0700
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,6 @@
@SET_MAKE@
-SOURCES = libopcodes.c $(libopcodes_la_SOURCES)
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -88,11 +86,11 @@ depcomp =
am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = libopcodes.c $(libopcodes_la_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -186,11 +184,8 @@ WARN_CFLAGS = @WARN_CFLAGS@
WIN32LDFLAGS = @WIN32LDFLAGS@
WIN32LIBADD = @WIN32LIBADD@
XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@@ -209,6 +204,9 @@ build_os = @build_os@
build_vendor = @build_vendor@
cgendir = @cgendir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -216,18 +214,22 @@ host_cpu = @host_cpu@
host_noncanonical = @host_noncanonical@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -649,15 +651,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
+ cd $(srcdir) && $(AUTOMAKE) --cygnus \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
+ $(AUTOMAKE) --cygnus Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -742,7 +744,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -754,7 +762,7 @@ $(RECURSIVE_TARGETS):
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -762,7 +770,13 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -783,7 +797,7 @@ maintainer-clean-recursive:
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -1112,8 +1126,8 @@ i386-gen: i386-gen.o
i386-gen.o: i386-gen.c i386-opc.h
-i386-tbl.h: @MAINT@ i386-gen i386-opc.tbl i386-reg.tbl
- ./i386-gen --srcdir $(srcdir) > $(srcdir)/i386-tbl.h
+$(srcdir)/i386-tbl.h: @MAINT@ i386-gen i386-opc.tbl i386-reg.tbl
+ ./i386-gen --srcdir $(srcdir) > $@
ia64-gen: ia64-gen.o
$(LINK) ia64-gen.o $(LIBIBERTY)
@@ -1121,8 +1135,9 @@ ia64-gen: ia64-gen.o
ia64-gen.o: ia64-gen.c ia64-opc.c ia64-opc-a.c ia64-opc-b.c ia64-opc-f.c \
ia64-opc-i.c ia64-opc-m.c ia64-opc-d.c ia64-opc.h
-ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl ia64-waw.tbl ia64-war.tbl
- ./ia64-gen --srcdir $(srcdir) > $(srcdir)/ia64-asmtab.c
+$(srcdir)/ia64-asmtab.c: @MAINT@ ia64-gen ia64-ic.tbl ia64-raw.tbl \
+ ia64-waw.tbl ia64-war.tbl
+ ./ia64-gen --srcdir $(srcdir) > $@
s390-mkopc: s390-mkopc.c
$(CC_FOR_BUILD) -o s390-mkopc $(srcdir)/s390-mkopc.c
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-07-06 14:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-07-06 14:09 [patch] Fix opcode/Makefile.am Mark Kettenis
2007-07-06 14:41 ` H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).