diff options
| author | Michael Adam <obnox@samba.org> | 2009-07-01 11:06:34 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-11-26 11:40:50 +0100 |
| commit | 4a48ad33e811140df5f3288c893126633a0d9a2a (patch) | |
| tree | f262a4c07bfd46b683337fd596b8233dbf6fac17 /packaging | |
| parent | f71240328f5506312b4e2573e9279b0895d660e7 (diff) | |
| download | samba-4a48ad33e811140df5f3288c893126633a0d9a2a.tar.gz samba-4a48ad33e811140df5f3288c893126633a0d9a2a.tar.xz samba-4a48ad33e811140df5f3288c893126633a0d9a2a.zip | |
packaging(RHEL-CTDB): disable the merged build.
Michael
(cherry picked from commit 94bcef772d2a78711a345963aa1edc7037d7057d)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/RHEL-CTDB/configure.rpm | 1 | ||||
| -rw-r--r-- | packaging/RHEL-CTDB/samba.spec.tmpl | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index b9a1ee12c2b..84e73461a6f 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -58,6 +58,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ --without-ldb \ --without-dnsupdate \ --with-aio-support \ + --disable-merged-build $* make showlayout diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index a9bac921614..0df0bc1bded 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -185,7 +185,8 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \ --with-ctdb=/usr/include \ --without-ldb \ --without-dnsupdate \ - --with-aio-support + --with-aio-support \ + --disable-merged-build make showlayout @@ -249,7 +250,8 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-ctdb=/usr/include \ --without-ldb \ --without-dnsupdate \ - --with-aio-support + --with-aio-support\ + --disable-merged-build make showlayout |