tag 338603 patch
thanks

Hi,

please find attached a patch implementing what Petr suggested. I know
that I didn't use a patch/unpatch rule, but the "dirty" (patched)
sources will only be used during the build on kfreebsd-*, so that
shouldn't cause too much troubles. I just tried to KISS.

Please note that I don't intend to NMU it, that was just a way for me to
propose a changelog entry and to call debdiff easily. ;-)

Cheers,

-- 
Cyril Brulebois
diff -u memtest86+-1.65/debian/changelog memtest86+-1.65/debian/changelog
--- memtest86+-1.65/debian/changelog
+++ memtest86+-1.65/debian/changelog
@@ -1,3 +1,13 @@
+memtest86+ (1.65-1.1) unstable; urgency=low
+
+  * Porter NMU.
+  * Add support for GNU/kFreeBSD (Closes: #338603):
+     - Adjust debian/rules to patch conditionally memtest{,_shared}.lds to
+       handle the right OUTPUT_FORMAT.
+     - Add "kfreebsd-i386 kfreebsd-amd64" to the Architecture field.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]>  Sat, 31 Mar 2007 04:27:30 +0200
+
 memtest86+ (1.65-1) unstable; urgency=low
 
   * New upstream release (Closes: #331394).
diff -u memtest86+-1.65/debian/control memtest86+-1.65/debian/control
--- memtest86+-1.65/debian/control
+++ memtest86+-1.65/debian/control
@@ -6,7 +6,7 @@
 Standards-Version: 3.6.1
 
 Package: memtest86+
-Architecture: i386 amd64
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
 Suggests: hwtools, sysutils, kernel-patch-badram, grub (>= 0.95+cvs20040624), mtools
 Description: thorough real-mode memory tester
  Memtest86+ scans your RAM for errors.
diff -u memtest86+-1.65/debian/rules memtest86+-1.65/debian/rules
--- memtest86+-1.65/debian/rules
+++ memtest86+-1.65/debian/rules
@@ -15,6 +15,11 @@
 
 	-$(MAKE) clean
 
+# Different kernels, ABIs, ld defaults, see #338603
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+	sed -i -e 's/"elf32-i386"/"elf32-i386-freebsd"/' memtest.lds memtest_shared.lds
+endif
+
 	dh_clean
 
 install: build

Attachment: pgphf3DDroZOW.pgp
Description: PGP signature

Reply via email to