[samba4] Add patch to ignore --disable-silent-rules configure parameter

Milan Crha mcrha at fedoraproject.org
Thu Aug 11 12:47:40 UTC 2011


commit 72add7c2e9ba8fced4253c01f64ad604abfcd451
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Aug 11 14:47:13 2011 +0200

    Add patch to ignore --disable-silent-rules configure parameter

 ...-4.0.0alpha16-ignore-disable-silent-rules.patch |   14 ++++++++++++++
 samba4.spec                                        |    3 +++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/samba-4.0.0alpha16-ignore-disable-silent-rules.patch b/samba-4.0.0alpha16-ignore-disable-silent-rules.patch
new file mode 100644
index 0000000..e46bb0d
--- /dev/null
+++ b/samba-4.0.0alpha16-ignore-disable-silent-rules.patch
@@ -0,0 +1,14 @@
+diff -up samba-4.0.0alpha16/buildtools/wafsamba/wscript.ignore-disable-silent-rules samba-4.0.0alpha16/buildtools/wafsamba/wscript
+--- samba-4.0.0alpha16/buildtools/wafsamba/wscript.ignore-disable-silent-rules	2011-08-11 14:42:40.339016315 +0200
++++ samba-4.0.0alpha16/buildtools/wafsamba/wscript	2011-08-11 14:43:37.963665456 +0200
+@@ -23,6 +23,10 @@ def set_options(opt):
+ 
+     gr = opt.option_group('library handling options')
+ 
++    gr.add_option('--disable-silent-rules',
++                   help=("does nothing, just to ignore fedora's default configure parameter"),
++                   action="store_false", dest='UNUSED_DISABLE_SILENT_RULES', default='')
++
+     gr.add_option('--bundled-libraries',
+                    help=("comma separated list of bundled libraries. May include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"),
+                    action="store", dest='BUNDLED_LIBS', default='')
diff --git a/samba4.spec b/samba4.spec
index 8d955dd..53c016b 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -45,6 +45,7 @@ Source5: %{name}.init
 %endif
 
 Patch01: samba-4.0.0alpha16.buildfix.patch
+Patch02: samba-4.0.0alpha16-ignore-disable-silent-rules.patch
 
 Requires(pre): /usr/sbin/groupadd
 
@@ -174,6 +175,7 @@ domains and to use Windows user and group accounts on Linux.
 
 # copy Red Hat specific scripts
 %patch01 -p1 -b .buildfix
+%patch02 -p1 -b .ignore-disable-silent-rules
 
 %build
 %configure \
@@ -843,6 +845,7 @@ exit 0
 %changelog
 * Thu Aug 11 2011 Milan Crha <mcrha at redhat.com> - 4.0.0-36.alpha16
 - Keep more libraries in samba4-libs and make conflicting as builtin.
+- Add patch to ignore --disable-silent-rules configure parameter
 
 * Tue Aug  2 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-35.alpha16
 - Rebase to new upstream release.


More information about the scm-commits mailing list