Subject: Re: pkg/35955: sysutils/extipl doesn't work on amd64
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Kimura Fuyuki <fuyuki@hadaly.org>
List: pkgsrc-bugs
Date: 03/09/2007 22:15:08
The following reply was made to PR pkg/35955; it has been noted by GNATS.
From: Kimura Fuyuki <fuyuki@hadaly.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/35955: sysutils/extipl doesn't work on amd64
Date: Sat, 10 Mar 2007 07:11:21 +0900
On Saturday 10 March 2007, Joerg Sonnenberger wrote:
>
> I'd avoid the char -> int8, short ->int16 to keep the local changes
> smaller. They are fixed on any sane architecture. Can I ask to reduce
> the patch by that? The rest looks good, but I can't test it on 64bit
> right now.
Yes, I did too much. The following should be enough.
diff -ruN --exclude=CVS extipl.orig/distinfo extipl/distinfo
--- extipl.orig/distinfo 2005-02-24 22:40:52.000000000 +0900
+++ extipl/distinfo 2007-03-10 07:04:37.000000000 +0900
@@ -4,3 +4,4 @@
RMD160 (extipl-5.04.tar.gz) = a7c037f92609463d61b3c7d52276e3849aa44055
Size (extipl-5.04.tar.gz) = 85382 bytes
SHA1 (patch-aa) = 12240b347d1d5d6d363a070376b1c115a004f454
+SHA1 (patch-ab) = ee21cea6db73a4b835609febd476c7f38d979e7d
diff -ruN --exclude=CVS extipl.orig/patches/patch-ab extipl/patches/patch-ab
--- extipl.orig/patches/patch-ab 1970-01-01 09:00:00.000000000 +0900
+++ extipl/patches/patch-ab 2007-03-10 07:04:26.000000000 +0900
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- extipl.h.orig 2002-03-25 22:48:52.000000000 +0900
++++ extipl.h
+@@ -5,4 +5,6 @@
+ */
+
++#include <stdint.h>
++
+ #define VERSION "5.04"
+ #define DATE "2002/03/26"
+@@ -40,5 +42,5 @@
+
+ typedef unsigned char byte;
+-typedef unsigned long long ul_long;
++typedef uint64_t ul_long;
+
+ typedef struct hdadr_s {
+@@ -53,6 +55,6 @@ typedef struct partition_s {
+ byte sysind;
+ hdadr_s end_chs;
+- unsigned long sector_offset;
+- unsigned long nr_sector;
++ uint32_t sector_offset;
++ uint32_t nr_sector;
+ } partition_s;
+