diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2012-03-15 17:12:10 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2012-03-15 17:12:10 +0100 |
| commit | f069b04dba54a38ee7f5fb7f6b5891764fa18f87 (patch) | |
| tree | 306f6dc6cfca17e6187bf235e999d564cc51a40f | |
| parent | 23af321fca771ed6d45bc90a493c2ffd123fc4b9 (diff) | |
| download | samba4-f069b04dba54a38ee7f5fb7f6b5891764fa18f87.tar.gz samba4-f069b04dba54a38ee7f5fb7f6b5891764fa18f87.tar.xz samba4-f069b04dba54a38ee7f5fb7f6b5891764fa18f87.zip | |
Fix RHEL6 build with --target.
| -rw-r--r-- | samba4-waf_target.patch | 28 | ||||
| -rw-r--r-- | samba4.spec | 12 |
2 files changed, 35 insertions, 5 deletions
diff --git a/samba4-waf_target.patch b/samba4-waf_target.patch new file mode 100644 index 0000000..3690d20 --- /dev/null +++ b/samba4-waf_target.patch @@ -0,0 +1,28 @@ +commit 7c7d54e0d18e1a840abdcc54be31b0dee998bd3f
+Author: Andreas Schneider <asn@samba.org>
+AuthorDate: Thu Mar 15 17:04:00 2012 +0100
+Commit: Andreas Schneider <asn@samba.org>
+CommitDate: Thu Mar 15 17:04:00 2012 +0100
+
+ waf: Add autoconf --target support.
+
+ This is needed on some platforms so that you can set it and it is not
+ automagicaly transformed into --targets.
+---
+ buildtools/wafsamba/wscript | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
+index 094f9cc..49d2107 100755
+--- a/buildtools/wafsamba/wscript
++++ b/buildtools/wafsamba/wscript
+@@ -156,6 +156,9 @@ def set_options(opt):
+ opt.add_option('--host',
+ help=SUPPRESS_HELP,
+ action='store', dest='AUTOCONF_HOST', default='')
++ opt.add_option('--target',
++ help=SUPPRESS_HELP,
++ action='store', dest='AUTOCONF_TARGET', default='')
+ opt.add_option('--program-prefix',
+ help=SUPPRESS_HELP,
+ action='store', dest='AUTOCONF_PROGRAM_PREFIX', default='')
\ No newline at end of file diff --git a/samba4.spec b/samba4.spec index 0c62086..da41808 100644 --- a/samba4.spec +++ b/samba4.spec @@ -60,6 +60,7 @@ Source102: winbind.init Patch1: samba4-libpdb-soversion.patch Patch2: samba4-samr-lsa-session_key.patch +Patch3: samba4-waf_target.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -308,14 +309,15 @@ link against the SMB, RPC and other protocols. %prep %setup -q -n samba-%{version}%{pre_release} -%patch1 -p1 -b .waf +%patch1 -p1 -b .waf_tdb %patch2 -p1 -b .session_key +%patch3 -p1 -b .waf_target %build -%define talloc_lib "" -%define tevent_lib "" -%define tdb_lib "" -%define ldb_lib "" +%define _talloc_lib %nil +%define _tevent_lib %nil +%define _tdb_lib %nil +%define _ldb_lib %nil %if ! %with_talloc %define _talloc_lib ,!talloc |