[Pkg-ROX-devel] Bug#294702: rox: FTBFS on Hurd due to hardcoded references to linux

[Pierre Chifflier]

This is a multi-part MIME message sent by reportbug.

--===============0345943570==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: rox
Severity: normal
Tags: patch
Justification: fails to build from source

rox fails to build from source on Hurd, dur to hardcoded references to
Linux-ix86 in file debian/rules.

Patch is attached to use uname commands in makefile to detect platform
exactly like build script does.

Regards,

Pierre.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.10-ac4
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)

--===============0345943570==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="00_rox.patch"

--- ROX-ORIG/rox-2.2.0/debian/rules	2005-02-10 15:05:17.000000000 +0100
+++ ROX/rox-2.2.0/debian/rules	2005-02-05 19:37:09.000000000 +0100
@@ -7,6 +7,21 @@
 PACKAGE  := $(shell dh_listpackages)
 DESTDIR  := $(shell pwd)/debian/$(PACKAGE)
 BUILDDIR := $(shell pwd)
+ARCH     := $(shell uname -m)
+PLATFORM := $(shell uname -s)
+
+ifeq ($(ARCH),i386)
+ARCH = "ix86"
+endif
+ifeq ($(ARCH),i486)
+ARCH = "ix86"
+endif
+ifeq ($(ARCH),i586)
+ARCH = "ix86"
+endif
+ifeq ($(ARCH),i686)
+ARCH = "ix86"
+endif
 
 include /usr/share/dpatch/dpatch.make
 
@@ -30,7 +45,7 @@
 myclean:
 	dh_testdir
 	dh_testroot
-	( cd ${BUILDDIR}/ROX-Filer && rm -rf build Linux-ix86 )
+	( cd ${BUILDDIR}/ROX-Filer && rm -rf build ${PLATFORM}-${ARCH} )
 	rm -f build-stamp configure-stamp
 	rm -rf $(DESTDIR)
 	dh_clean
@@ -51,7 +66,7 @@
 	cp -r ${BUILDDIR}/ROX-Filer/images ${DESTDIR}/usr/share/rox
 	cp -r ${BUILDDIR}/ROX-Filer/ROX ${DESTDIR}/usr/share/rox
 	
-	cp ${BUILDDIR}/ROX-Filer/Linux-ix86/ROX-Filer ${DESTDIR}/usr/bin/rox
+	cp ${BUILDDIR}/ROX-Filer/${PLATFORM}-${ARCH}/ROX-Filer ${DESTDIR}/usr/bin/rox
 	cp ${BUILDDIR}/ROX-Filer/.DirIcon ${DESTDIR}/usr/share/rox/.DirIcon
 	cp rox.xml ${DESTDIR}/usr/share/mime/packages
 

--===============0345943570==--