[Pkg-samba-maint] r3018 - in trunk/samba/debian: . patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Tue Sep 8 02:37:00 UTC 2009
Author: vorlon
Date: 2009-09-08 02:37:00 +0000 (Tue, 08 Sep 2009)
New Revision: 3018
Added:
trunk/samba/debian/patches/external-talloc-support.patch
Removed:
trunk/samba/debian/patches/external-tdb-support.patch
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/patches/series
Log:
Add a patch header; and oops, this is about libtalloc, not libtdb.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2009-09-08 02:29:29 UTC (rev 3017)
+++ trunk/samba/debian/changelog 2009-09-08 02:37:00 UTC (rev 3018)
@@ -25,11 +25,14 @@
[ Steve Langasek ]
* Change swat update-inetd call to use --remove only on purge,
and --disable on removal.
- * Add missing build-dependency on pkg-config, needed to fix libtdb
+ * Add missing build-dependency on pkg-config, needed to fix libtalloc
detection (which will make the package FTBFS until the makefile
- substitutions are fixed)
- * debian/patches/external-tdb-support.patch: fix the Makefile so it works
- when using external tdb instead of giving a missing-depend error.
+ substitutions are fixed)
+ * debian/patches/external-talloc-support.patch: fix the Makefile so it
+ works when using external talloc instead of giving a missing-depend
+ error.
+ * debian/patches/autoconf.patch: resurrect this patch, needed for the
+ above.
-- Steve Langasek <vorlon at debian.org> Sun, 23 Aug 2009 22:35:16 -0700
Copied: trunk/samba/debian/patches/external-talloc-support.patch (from rev 3017, trunk/samba/debian/patches/external-tdb-support.patch)
===================================================================
--- trunk/samba/debian/patches/external-talloc-support.patch (rev 0)
+++ trunk/samba/debian/patches/external-talloc-support.patch 2009-09-08 02:37:00 UTC (rev 3018)
@@ -0,0 +1,45 @@
+Description: Fix build against external libtalloc
+ Upstream Makefile is untested with builds against external libtalloc; fix a
+ make error when libtalloc is not being built.
+Author: Steve Langasek <vorlon at debian.org>
+
+Index: samba-deb.clean/source3/Makefile.in
+===================================================================
+--- samba-deb.clean.orig/source3/Makefile.in
++++ samba-deb.clean/source3/Makefile.in
+@@ -1694,11 +1694,11 @@
+ LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
+ LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
+ LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
+-LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
+-LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
++ at NO_LIBTALLOC@LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
++ at NO_LIBTALLOC@LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
+
+-$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
+- @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
++ at NO_LIBTALLOC@$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
++ at NO_LIBTALLOC@ @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
+
+ $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
+ @echo Linking shared library $@
+Index: samba-deb.clean/source3/configure.in
+===================================================================
+--- samba-deb.clean.orig/source3/configure.in
++++ samba-deb.clean/source3/configure.in
+@@ -33,6 +33,7 @@
+ [ enable_external_libtalloc=yes ],
+ [ if x$enable_external_libtalloc = xyes; then
+ AC_MSG_ERROR([Unable to find libtalloc])
++ NO_LIBTALLOC='#'
+ else
+ enable_external_libtalloc=no
+ fi
+@@ -49,6 +50,7 @@
+ LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
+ done
+ AC_SUBST(LIBTALLOC_OBJ0)
++AC_SUBST(NO_LIBTALLOC)
+
+ m4_include(../lib/tevent/libtevent.m4)
+
Deleted: trunk/samba/debian/patches/external-tdb-support.patch
===================================================================
--- trunk/samba/debian/patches/external-tdb-support.patch 2009-09-08 02:29:29 UTC (rev 3017)
+++ trunk/samba/debian/patches/external-tdb-support.patch 2009-09-08 02:37:00 UTC (rev 3018)
@@ -1,40 +0,0 @@
-Index: samba-deb.clean/source3/Makefile.in
-===================================================================
---- samba-deb.clean.orig/source3/Makefile.in
-+++ samba-deb.clean/source3/Makefile.in
-@@ -1694,11 +1694,11 @@
- LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
- LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
- LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
--LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
--LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-+ at NO_LIBTALLOC@LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc. at SYMSEXT@
-+ at NO_LIBTALLOC@LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
-
--$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
-- @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-+ at NO_LIBTALLOC@$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
-+ at NO_LIBTALLOC@ @$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
-
- $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
- @echo Linking shared library $@
-Index: samba-deb.clean/source3/configure.in
-===================================================================
---- samba-deb.clean.orig/source3/configure.in
-+++ samba-deb.clean/source3/configure.in
-@@ -33,6 +33,7 @@
- [ enable_external_libtalloc=yes ],
- [ if x$enable_external_libtalloc = xyes; then
- AC_MSG_ERROR([Unable to find libtalloc])
-+ NO_LIBTALLOC='#'
- else
- enable_external_libtalloc=no
- fi
-@@ -49,6 +50,7 @@
- LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
- done
- AC_SUBST(LIBTALLOC_OBJ0)
-+AC_SUBST(NO_LIBTALLOC)
-
- m4_include(../lib/tevent/libtevent.m4)
-
Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series 2009-09-08 02:29:29 UTC (rev 3017)
+++ trunk/samba/debian/patches/series 2009-09-08 02:37:00 UTC (rev 3018)
@@ -13,4 +13,4 @@
fix-manpages-warnings.patch
codepages-location.patch
536757.patch
-external-tdb-support.patch
+external-talloc-support.patch
More information about the Pkg-samba-maint
mailing list