[Pkg-samba-maint] [samba] 04/06: Drop no_build_options.patch as it breaks "make test"

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch master
in repository samba.

commit 7c4a9b0c3c81e11879a8cca9b45ef76aeb4f3d0f
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Apr 27 22:31:29 2016 +0200

    Drop no_build_options.patch as it breaks "make test"
    
    For example, Samba3::have_ads search WITH_ADS in the output of smbd -b
---
 debian/patches/no_build_options.patch | 53 -----------------------------------
 debian/patches/series                 |  1 -
 source3/smbd/server.c                 |  5 +++-
 source3/wscript_build                 | 12 +++++++-
 4 files changed, 15 insertions(+), 56 deletions(-)

diff --git a/debian/patches/no_build_options.patch b/debian/patches/no_build_options.patch
deleted file mode 100644
index 4773d28..0000000
--- a/debian/patches/no_build_options.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/source3/smbd/server.c b/source3/smbd/server.c
-index 8c77500..fa05a28 100644
---- a/source3/smbd/server.c
-+++ b/source3/smbd/server.c
-@@ -1200,7 +1200,7 @@ extern void build_options(bool screen);
- 	}
- 
- 	if (print_build_options) {
--		build_options(True); /* Display output to screen as well as debug */
-+		DEBUG(0, ("For build options, please check the Debian packaging (apt-get source samba)."));
- 		exit(0);
- 	}
- 
-@@ -1271,9 +1271,6 @@ extern void build_options(bool screen);
- 	DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
- 		 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
- 
--	/* Output the build options to the debug log */ 
--	build_options(False);
--
- 	if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4) {
- 		DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
- 		exit(1);
-diff --git a/source3/wscript_build b/source3/wscript_build
-index 8adb942..fbf79c8 100755
---- a/source3/wscript_build
-+++ b/source3/wscript_build
-@@ -7,16 +7,6 @@ LIBS='ICONV'
- 
- config_h = "../include/config.h"
- 
--bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
--
--t = bld.SAMBA_GENERATOR('build_env.h',
--                        source='script/build_env.sh',
--                        target='include/build_env.h',
--                        rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
--# todo: work out what is really wanted here
--t.env.SRCDIR = bld.path.abspath()
--t.env.BUILDDIR = bld.path.abspath()
--
- bld.SETUP_BUILD_GROUPS()
- 
- ######################## SUBSYSTEMS #################################
-@@ -609,7 +599,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
-                    smbd/oplock_linux.c
-                    smbd/notify.c
-                    smbd/notify_msg.c
--                   smbd/build_options.c''' + NOTIFY_SOURCES,
-+                   ''' + NOTIFY_SOURCES,
-                    deps='''
-                    talloc
-                    tevent
diff --git a/debian/patches/series b/debian/patches/series
index 1980b23..a3779ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,5 +13,4 @@ heimdal-rfc3454.txt
 Fix-privacy-breach-on-google.com.patch
 fix-cluster-build.diff
 ctdb-Fix-detection-of-gnukfreebsd.patch
-no_build_options.patch
 no_build_system.patch
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index f33b4d2..b7948b4 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1316,7 +1316,7 @@ extern void build_options(bool screen);
 	}
 
 	if (print_build_options) {
-		DEBUG(0, ("For build options, please check the Debian packaging (apt-get source samba)."));
+		build_options(True); /* Display output to screen as well as debug */
 		exit(0);
 	}
 
@@ -1388,6 +1388,9 @@ extern void build_options(bool screen);
 	DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
 		 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
 
+	/* Output the build options to the debug log */ 
+	build_options(False);
+
 	if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4) {
 		DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
 		exit(1);
diff --git a/source3/wscript_build b/source3/wscript_build
index 572e9a3..2638d38 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -7,6 +7,16 @@ LIBS='ICONV'
 
 config_h = "../include/config.h"
 
+bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
+
+t = bld.SAMBA_GENERATOR('build_env.h',
+                        source='script/build_env.sh',
+                        target='include/build_env.h',
+                        rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
+# todo: work out what is really wanted here
+t.env.SRCDIR = bld.path.abspath()
+t.env.BUILDDIR = bld.path.abspath()
+
 bld.SETUP_BUILD_GROUPS()
 
 ######################## SUBSYSTEMS #################################
@@ -591,7 +601,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    smbd/oplock_linux.c
                    smbd/notify.c
                    smbd/notify_msg.c
-                   ''' + NOTIFY_SOURCES,
+                   smbd/build_options.c''' + NOTIFY_SOURCES,
                    deps='''
                    talloc
                    tevent

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git