diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-01-01 22:31:11 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-01-01 22:31:11 +0000 |
| commit | 7ddd7ff23bcbd4ccb4590322837c6b2523f5e543 (patch) | |
| tree | eb485989542870d7f1f12d8db024277907212cc8 /patches/confuse-2.6 | |
| parent | 368068f2dd173c03ce50ff8e647997dd23610f4e (diff) | |
| download | ptxdist-7ddd7ff23bcbd4ccb4590322837c6b2523f5e543.tar.gz ptxdist-7ddd7ff23bcbd4ccb4590322837c6b2523f5e543.tar.xz | |
* confuse: make it buildable under gcc-4.3.2 again
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9336 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/confuse-2.6')
| -rw-r--r-- | patches/confuse-2.6/generic/confuse-2.6-autoreconf.diff | 12 | ||||
| -rw-r--r-- | patches/confuse-2.6/generic/confuse-2.6-werror.diff | 30 | ||||
| -rw-r--r-- | patches/confuse-2.6/generic/series | 2 |
3 files changed, 44 insertions, 0 deletions
diff --git a/patches/confuse-2.6/generic/confuse-2.6-autoreconf.diff b/patches/confuse-2.6/generic/confuse-2.6-autoreconf.diff new file mode 100644 index 000000000..a499d3f07 --- /dev/null +++ b/patches/confuse-2.6/generic/confuse-2.6-autoreconf.diff @@ -0,0 +1,12 @@ +diff -urN confuse-2.6-orig/src/Makefile.in confuse-2.6/src/Makefile.in +--- confuse-2.6-orig/src/Makefile.in 2007-12-29 11:56:12.000000000 +0100 ++++ confuse-2.6/src/Makefile.in 2009-01-01 23:27:27.000000000 +0100 +@@ -196,7 +196,7 @@ + libconfuse_la_SOURCES = confuse.c lexer.l + libconfuse_la_LIBADD = $(LTLIBINTL) + include_HEADERS = confuse.h +-@cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror ++@cc_is_gcc_TRUE@AM_CFLAGS = -Wall + CLEANFILES = *~ \#*\# + AM_LFLAGS = -Pcfg_yy -olex.yy.c + all: all-am diff --git a/patches/confuse-2.6/generic/confuse-2.6-werror.diff b/patches/confuse-2.6/generic/confuse-2.6-werror.diff new file mode 100644 index 000000000..7e7fbbf74 --- /dev/null +++ b/patches/confuse-2.6/generic/confuse-2.6-werror.diff @@ -0,0 +1,30 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [patch] remove -Werror + +With gcc-4.3.2 I get this error: + +cc1: warnings being treated as errors +lexer.c:1638: error: 'input' defined but not used +make[3]: *** [lexer.lo] Error 1 + +Fix it temporarily by removing -Werror. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: confuse-2.6/src/Makefile.am +=================================================================== +--- confuse-2.6.orig/src/Makefile.am ++++ confuse-2.6/src/Makefile.am +@@ -10,7 +10,7 @@ localedir = $(datadir)/locale + DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ + + if cc_is_gcc +-AM_CFLAGS=-Wall -Werror ++AM_CFLAGS=-Wall + endif + + LIBS = @LIBS@ diff --git a/patches/confuse-2.6/generic/series b/patches/confuse-2.6/generic/series new file mode 100644 index 000000000..ca9b6330e --- /dev/null +++ b/patches/confuse-2.6/generic/series @@ -0,0 +1,2 @@ +confuse-2.6-werror.diff +confuse-2.6-autoreconf.diff |