Merge lp:~ssalley/ubuntu/natty/likewise-open/likewise-open-fix-684579 into lp:ubuntu/natty/likewise-open

[Scott Salley]

The changes in the build environment have exposed places where libraries required for proper operation are missing from the link. This set of changes corrects the known problems for missing libraries (via patches) and also allows for autoreconf to be run during the build process to properly integrate those patches.

Note that many of these changes are being integrated or have been integrated upstream, but that they are generally being discovered in Natty.

Unmerged revisions

20. By Scott Salley on 2011-01-24

* LP: #684579
  - added debian/patches/add-dependencies-1.diff to add in libraries missing
    from the link that affect runtime behavior and prevent building when
    autotools are re-run
  - modified debian/rules to regenerate autoconf files so Makefile.am changes
    are picked up and to make future patch work easier

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-22 12:06:00 +0000
+++ debian/changelog	2011-01-25 00:12:17 +0000
@@ -1,3 +1,14 @@
+likewise-open (6.0.0.53010-2) natty; urgency=low
+
+  * LP: #684579
+    - added debian/patches/add-dependencies-1.diff to add in libraries missing
+      from the link that affect runtime behavior and prevent building when
+      autotools are re-run
+    - modified debian/rules to regenerate autoconf files so Makefile.am changes
+      are picked up and to make future patch work easier
+
+ -- Scott Salley <[e-mail]>  Mon, 24 Jan 2011 15:03:26 -0800
+
 likewise-open (6.0.0.53010-1) natty; urgency=high
 
   * Likewise Open 6.0

=== added file 'debian/patches/add-dependencies-1.diff'
--- debian/patches/add-dependencies-1.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/add-dependencies-1.diff	2011-01-25 00:12:17 +0000
@@ -0,0 +1,55 @@
+diff -Nurb -x debian likewise-open-6.0.0.53010/lsass/configure.in likewise-open-6.0.0.53010/lsass/configure.in
+--- likewise-open-6.0.0.53010/lsass/configure.in	2010-10-19 14:03:01.000000000 -0700
++++ likewise-open-6.0.0.53010/lsass/configure.in	2011-01-23 00:16:40.000000000 -0800
+@@ -882,15 +882,6 @@
+ # include <wc16str.h>
+ #endif
+ ])
+-AC_CHECK_MEMBERS([ucontext_t.uc_mcontext,
+-		  ucontext_t.uc_mcontext->__ss,
+-		  ucontext_t.uc_mcontext->__ss.__rip,
+-		  ucontext_t.uc_mcontext->__ss.__eip],
+-[], [], [AC_INCLUDES_DEFAULT
+-#ifdef HAVE_EXECINFO_H
+-# include <execinfo.h>
+-#endif
+-])
+ 
+ if test x"$ENABLE_COMPAT" = x"false"; then
+ AC_CHECK_HEADER([reg/reg.h],,[AC_MSG_ERROR([Could not find lwreg headers])],
+diff -Nurb -x debian likewise-open-6.0.0.53010/lwdns/lwdns/Makefile.am likewise-open-6.0.0.53010/lwdns/lwdns/Makefile.am
+--- likewise-open-6.0.0.53010/lwdns/lwdns/Makefile.am	2010-10-19 13:54:29.000000000 -0700
++++ likewise-open-6.0.0.53010/lwdns/lwdns/Makefile.am	2011-01-23 00:45:20.000000000 -0800
+@@ -34,7 +34,8 @@
+     @SOCKET_LIBS@    \
+     @NSL_LIBS@       \
+     @PTHREAD_LIBS@   \
+-    $(LWBASE_LIBS)
++    $(LWBASE_LIBS)   \
++    $(LWBASE_NOTHR_LIBS)
+ 
+ liblwdns_la_LDFLAGS = \
+     @KRB5_LDFLAGS@   \
+diff -Nurb -x debian likewise-open-6.0.0.53010/lwreg/client/Makefile.am likewise-open-6.0.0.53010/lwreg/client/Makefile.am
+--- likewise-open-6.0.0.53010/lwreg/client/Makefile.am	2010-10-19 13:54:30.000000000 -0700
++++ likewise-open-6.0.0.53010/lwreg/client/Makefile.am	2011-01-22 23:55:41.000000000 -0800
+@@ -11,4 +11,6 @@
+     @LWMSG_INCLUDES@
+ 
+ libregclient_la_LIBADD = \
+-	@top_builddir@/common/libregcommon.la
++	@top_builddir@/common/libregcommon.la \
++    @LWBASE_LIBS@ \
++    @LWMSG_LIBS@
+diff -Nurb -x debian likewise-open-6.0.0.53010/netlogon/tools/set_log_level/Makefile.am likewise-open-6.0.0.53010/netlogon/tools/set_log_level/Makefile.am
+--- likewise-open-6.0.0.53010/netlogon/tools/set_log_level/Makefile.am	2010-11-22 11:55:16.000000000 -0800
++++ likewise-open-6.0.0.53010/netlogon/tools/set_log_level/Makefile.am	2011-01-23 00:43:51.000000000 -0800
+@@ -5,7 +5,7 @@
+ lwnet_set_log_level_LDADD = \
+     @top_builddir@/client/liblwnetclientapi.la \
+     @top_builddir@/common/liblwnetcommon.la \
+-    -llwadvapi
++    -llwadvapi -llwadvapi_nothr
+ 
+ lwnet_set_log_level_SOURCES = \
+     main.c

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-22 12:06:00 +0000
+++ debian/patches/series	2011-01-25 00:12:17 +0000
@@ -16,3 +16,4 @@
 datadir.diff
 eventlog-libxml2
 use_offsetof.diff
+add-dependencies-1.diff

=== modified file 'debian/rules'
--- debian/rules	2010-11-22 12:06:00 +0000
+++ debian/rules	2011-01-25 00:12:17 +0000
@@ -45,7 +45,13 @@
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	## Everything is done during the build phase
+	for f in lwbase lwmsg \
+		lwreg pstore lwadvapi centutils netlogon lwio lwsm libschannel \
+		dcerpc eventlog lsass lwdns \
+		domainjoin srvsvc lwnetapi lwtools lwupgrade; do \
+			echo $$f && (cd $$f && ./autogen.sh) || exit 1;\
+	done
+	find . -type d -name autom4te.cache | xargs /bin/rm -rf
 	touch configure-stamp
 
 build: build-stamp