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

Bug#380066: libggi: FTBFS on GNU/kFreeBSD



Package: libggi
Severity: important
Version: 1:2.2.1-2
Tags: patch


Hi,

the current version fails to build on GNU/kFreeBSD.

It needs to restrict fbdev support only for Linux archs.
Please find attached patch with that.

Thanks in advance

                        Petr
diff -u libggi-2.2.1/debian/control libggi-2.2.1/debian/control
--- libggi-2.2.1/debian/control
+++ libggi-2.2.1/debian/control
@@ -169,7 +169,7 @@
   Homepage: http://www.ggi-project.org/
 
 Package: libggi-target-fbdev
-Architecture: any
+Architecture: i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
 Section: libs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, makedev (>= 2.3.1-24) | devfsd
diff -u libggi-2.2.1/debian/rules libggi-2.2.1/debian/rules
--- libggi-2.2.1/debian/rules
+++ libggi-2.2.1/debian/rules
@@ -14,6 +14,7 @@
 #HOST_ARCH  := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH))
 BUILD_TYPE := $(if $(DEB_BUILD_GNU_TYPE),$(DEB_BUILD_GNU_TYPE),$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE))
 HOST_TYPE  := $(if $(DEB_HOST_GNU_TYPE),$(DEB_HOST_GNU_TYPE),$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
+DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 #DFBGFX := /usr/lib/directfb-$(shell directfb-config --version)/gfxdrivers
 
@@ -99,12 +100,14 @@
 	 mv bin/cube3d			bin/ggi-cube3d;			\
 	 mv bin/monitest		bin/ggi-monitest;		\
 	 mv share/man/man1/cube3d.1	share/man/man1/ggi-cube3d.1;	\
-	 mv share/man/man1/monitest.1	share/man/man1/ggi-monitest.1;	\
-	 \
+	 mv share/man/man1/monitest.1	share/man/man1/ggi-monitest.1;	)
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	( set -e;
 	 cd $(INSTDIR)/etc/ggi/targets;					\
 	 mv fbdev.conf fbdev.conf-unhacked;				\
 	 sed -e '/directfb/ s/^/#/' <fbdev.conf-unhacked >fbdev.conf;	\
 	 rm fbdev.conf-unhacked;					)
+endif
 
 
 # Build architecture-independent files here.
@@ -127,10 +130,12 @@
 	dh_movefiles	-p$(tmtpkg)	usr/lib/ggi/display/monotext.*
 	dh_movefiles	-p$(ttipkg)	usr/lib/ggi/display/terminfo.*
 	dh_movefiles	-p$(tvcpkg)	usr/lib/ggi/display/vcsa.*
+ifeq (linux,$(DEB_HOST_ARCH_OS))
 	dh_movefiles	-p$(tfbpkg)	usr/lib/ggi/display/fbdev.*	\
 					usr/lib/ggi/display/linvtsw.*	\
 					usr/lib/ggi/default/fbdev/*/*.so\
 					etc/ggi/targets/fbdev.conf
+endif
 	dh_movefiles	-p$(tgdpkg)	usr/lib/ggi/display/glide.*
 	dh_movefiles	-p$(tsvpkg)	usr/lib/ggi/display/vgagl.*	\
 					usr/lib/ggi/display/svgalib*.*
@@ -166,11 +171,15 @@
 	dh_link		-p$(devpkg)	usr/share/doc/$(libpkg)		\
 					usr/share/doc/$(devpkg)
 #	dh_installdebconf
+ifeq (linux,$(DEB_HOST_ARCH_OS))
 	dh_installdocs	-N$(smppkg) -N$(emupkg) -N$(tmtpkg) -N$(tfbpkg)	-N$(txxpkg)
+	dh_installdocs	-p$(tfbpkg)	debian/tmp/README.mach64
+else
+	dh_installdocs	-N$(smppkg) -N$(emupkg) -N$(tmtpkg) -N$(txxpkg)
+endif
 	dh_installdocs	-p$(smppkg)	debian/README.samples
 	dh_installdocs	-p$(emupkg)	debian/tmp/README.*emu
 	dh_installdocs	-p$(tmtpkg)	debian/tmp/README.monotext
-	dh_installdocs	-p$(tfbpkg)	debian/tmp/README.mach64
 	dh_installdocs	-p$(txxpkg)	debian/tmp/README.X
 	dh_installexamples -p$(smppkg)	programs/demos/*.c programs/util/*.c
 	dh_installmenu

Reply to: