projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[debian/amanda]
/
gnulib
/
regenerate
/
no-error.patch
diff --git
a/gnulib/regenerate/no-error.patch
b/gnulib/regenerate/no-error.patch
index a12e7d2ec2ec58ebbf11c39bfb68e80bae1afc5e..ebe43e478eee349fedac3d780f583ef9d95d8503 100644
(file)
--- a/
gnulib/regenerate/no-error.patch
+++ b/
gnulib/regenerate/no-error.patch
@@
-7,7
+7,11
@@
Index: gnulib/Makefile.am
AM_CPPFLAGS =
+if GCC_COMPILER
AM_CPPFLAGS =
+if GCC_COMPILER
+<<<<<<< HEAD:gnulib/regenerate/no-error.patch
++ AM_CFLAGS += -Wno-error
+=======
+ AM_CFLAGS = -Wno-error -Wno-sign-compare
+ AM_CFLAGS = -Wno-error -Wno-sign-compare
+>>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/no-error.patch
+endif
noinst_LTLIBRARIES += libgnu.la
+endif
noinst_LTLIBRARIES += libgnu.la