[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

amsn: Fix FTBFS on hurd-i386



Package: amsn
Version: 0.98.4-3
Severity: important
Tags: patch
User: debian-hurd@lists.debian.org
Usertags: hurd

Hi,

currently amsn does not compile on hurd-i386. The problem is the
lack of support for GNU/Hurd in configure, configure.ac, and
Makefile.in. The attached patch fixes these issues (including removing
commented out code for Hurd in debian/rules). The patch should be
applied after 06_recognize_kfreebsd.patch.

Thanks,
Svante

diff -ur amsn-0.98.4/configure amsn-0.98.4.patched/configure
--- amsn-0.98.4/configure	2011-08-01 11:55:15.000000000 +0000
+++ amsn-0.98.4.patched/configure	2011-08-01 12:03:57.000000000 +0000
@@ -2292,6 +2292,9 @@
 	SunOS)
 		FOUND_OS=solaris
 		;;
+	GNU)
+		FOUND_OS=gnu
+		;;
 	*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if amsn will build on \`uname -s\`" >&5
 $as_echo_n "checking if amsn will build on \`uname -s\`... " >&6; }
diff -ur amsn-0.98.4/configure.ac amsn-0.98.4.patched/configure.ac
--- amsn-0.98.4/configure.ac	2011-08-01 11:55:15.000000000 +0000
+++ amsn-0.98.4.patched/configure.ac	2011-08-01 12:03:19.000000000 +0000
@@ -72,6 +72,9 @@
 	SunOS)
 		FOUND_OS=solaris
 		;;
+	GNU)
+		FOUND_OS=gnu
+		;;
 	*)
 		AC_MSG_CHECKING(if amsn will build on `uname -s`)
 		AC_MSG_RESULT(maybe)
diff -ur amsn-0.98.4/debian/rules amsn-0.98.4.patched/debian/rules
--- amsn-0.98.4/debian/rules	2011-07-01 23:25:43.000000000 +0000
+++ amsn-0.98.4.patched/debian/rules	2011-08-01 10:20:15.000000000 +0000
@@ -96,11 +96,9 @@
 	"$(CURDIR)/debian/amsn-data/usr/share/amsn/plugins/ebuddykiller/plugininfo.xml"
 	find $(CURDIR)/debian/amsn-data/usr/share/amsn/skins/Oxygen/ -name *.png -exec chmod 644 {} \;
 
-ifneq ($(DEB_HOST_ARCH_OS),hurd)
 	chmod 644 "$(CURDIR)/debian/amsn-data/usr/share/amsn/utils/asyncresolver/libasyncresolver.so" 
 	mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/asyncresolver $(CURDIR)/debian/amsn/usr/lib/amsn/utils
 	mv $(CURDIR)/debian/amsn-data/usr/share/amsn/utils/webcamsn $(CURDIR)/debian/amsn/usr/lib/amsn/utils
-endif
 
 	# .so files go in /usr/lib
 	
diff -ur amsn-0.98.4/Makefile.in amsn-0.98.4.patched/Makefile.in
--- amsn-0.98.4/Makefile.in	2010-03-18 19:58:48.000000000 +0000
+++ amsn-0.98.4.patched/Makefile.in	2011-08-01 12:13:55.000000000 +0000
@@ -188,6 +188,12 @@
 FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/linux/capture/capture.so utils/linux/capture/pkgIndex.tcl utils/linux/linflash/flash.so utils/linux/linflash/pkgIndex.tcl utils/linux/traydock/libtray.so  utils/linux/traydock/pkgIndex.tcl utils/linux/capture/libng/plugins/drv0-v4l2.so utils/linux/capture/libng/plugins/conv-mjpeg.so utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl utils/tclISF/tclISF.so utils/tclISF/pkgIndex.tcl utils/asyncresolver/asyncresolver.tcl utils/asyncresolver/libasyncresolver.so utils/asyncresolver/pkgIndex.tcl
 
 FILES_TO_EXCLUDE += AppMain.tcl
+                else
+                        ifeq ($(FOUND_OS),gnu)
+FILES_TO_INSTALL += utils/webcamsn/webcamsn.so utils/webcamsn/pkgIndex.tcl utils/TkCximage/TkCximage.so utils/TkCximage/pkgIndex.tcl utils/tcl_siren/tcl_siren.so utils/tcl_siren/pkgIndex.tcl utils/tclISF/tclISF.so utils/tclISF/pkgIndex.tcl utils/asyncresolver/asyncresolver.tcl utils/asyncresolver/libasyncresolver.so utils/asyncresolver/pkgIndex.tcl
+
+FILES_TO_EXCLUDE += AppMain.tcl
+                        endif
 		endif
 	endif
 endif

Reply to: