From: Joseph Jezak Date: Sat, 7 Apr 2007 16:27:25 +0000 (+0000) Subject: Added patch for amd64. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=485a885c9f914a196b5b6e1e706de5eaf654924e;p=gentoo.git Added patch for amd64. Package-Manager: portage-2.1.2.3 --- diff --git a/sys-fs/mac-fdisk/ChangeLog b/sys-fs/mac-fdisk/ChangeLog index bd5e96e38661..17f2059beece 100644 --- a/sys-fs/mac-fdisk/ChangeLog +++ b/sys-fs/mac-fdisk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/mac-fdisk # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.18 2007/02/13 21:15:30 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.19 2007/04/07 16:27:25 josejx Exp $ + + 07 Apr 2007; Joseph Jezak + +files/mac-fdisk-amd64.patch, mac-fdisk-0.1-r6.ebuild: + Added patch for amd64. 13 Feb 2007; Chris Gianelloni mac-fdisk-0.1-r6.ebuild: diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest index 5184605984cf..b2c845fbb48e 100644 --- a/sys-fs/mac-fdisk/Manifest +++ b/sys-fs/mac-fdisk/Manifest @@ -17,6 +17,10 @@ AUX mac-fdisk-0.1-r6-ppc64.patch 15294 RMD160 4ef172a586868498756309eeb4a3814c3e MD5 17b0220c9e22309d960c26c2cbc0cf95 files/mac-fdisk-0.1-r6-ppc64.patch 15294 RMD160 4ef172a586868498756309eeb4a3814c3ed0f346 files/mac-fdisk-0.1-r6-ppc64.patch 15294 SHA256 66d7ffd675b04c6616cf2b365d80e766b81e030e9578b4abe0480c96f2819585 files/mac-fdisk-0.1-r6-ppc64.patch 15294 +AUX mac-fdisk-amd64.patch 5663 RMD160 55f23ccd1831765f0d788138237c15660a508408 SHA1 f21b2618ed63b7263ecdeab4aa49082078b46b8e SHA256 58333057a2860e33442b516099cff09e388dc4d16064eac3007b1688f97828bb +MD5 28d0de134859304424d95ebc824a7be7 files/mac-fdisk-amd64.patch 5663 +RMD160 55f23ccd1831765f0d788138237c15660a508408 files/mac-fdisk-amd64.patch 5663 +SHA256 58333057a2860e33442b516099cff09e388dc4d16064eac3007b1688f97828bb files/mac-fdisk-amd64.patch 5663 DIST mac-fdisk_0.1-11.diff.gz 19529 RMD160 90ede691daf990427181dc5485172d8ca8f82c7d SHA1 e69e4ac0e827b4e6499bfddbc16573585a33fc7b SHA256 7fc6c859e8c22ae05c24397bb2bb849705ab235329c3bc5c206e7e1c03787afd DIST mac-fdisk_0.1-13.diff.gz 19615 RMD160 cc6ddbdee6c8bac9d03d6ae50fc6d23e29a21188 SHA1 725d13418c087059cba76cc8b227e72d7b99ada2 SHA256 a6dd96c8ddce896dac2e2b2c2eff346d339ae697cd19e2ac9676556d8bc63644 DIST mac-fdisk_0.1.orig.tar.gz 55817 RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 SHA1 47013d3d74892d53c31a73e75c32fda2bf173252 SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66 @@ -24,14 +28,14 @@ EBUILD mac-fdisk-0.1-r3.ebuild 1111 RMD160 e123d7d57e51b9013f4dd0fae2150cdcc5aa7 MD5 55d14b0765b250bce58ef4c64d4883cb mac-fdisk-0.1-r3.ebuild 1111 RMD160 e123d7d57e51b9013f4dd0fae2150cdcc5aa7faf mac-fdisk-0.1-r3.ebuild 1111 SHA256 2645e999a8e4ed0b305b532bc6d47c417bbef7d5c5fbeefc537cf9a8a73c4fe2 mac-fdisk-0.1-r3.ebuild 1111 -EBUILD mac-fdisk-0.1-r6.ebuild 1084 RMD160 b8b2cbfb70cdae5592e2f6ae82eac0a5bfd9b57f SHA1 170784b2c68afbc588ad96edce6518e5464ce4ea SHA256 1659c9eaa5b0cc2494306b66c1541a420633db233b9baf0af8f0f0b992cfa0e0 -MD5 667228d597890f405a9e68dc1f2498a7 mac-fdisk-0.1-r6.ebuild 1084 -RMD160 b8b2cbfb70cdae5592e2f6ae82eac0a5bfd9b57f mac-fdisk-0.1-r6.ebuild 1084 -SHA256 1659c9eaa5b0cc2494306b66c1541a420633db233b9baf0af8f0f0b992cfa0e0 mac-fdisk-0.1-r6.ebuild 1084 -MISC ChangeLog 3781 RMD160 a0ddc0542607bd0ce01469a88641715028b9d9c0 SHA1 5cfc069b508a025438d6cd34d1bdc1ee582fa1f4 SHA256 acd8396a907ac4dbb834cd9274f9a150f7cc1a6b22780bec4fde18a5c4828cad -MD5 666f79d124cf952708e5dd0a72815589 ChangeLog 3781 -RMD160 a0ddc0542607bd0ce01469a88641715028b9d9c0 ChangeLog 3781 -SHA256 acd8396a907ac4dbb834cd9274f9a150f7cc1a6b22780bec4fde18a5c4828cad ChangeLog 3781 +EBUILD mac-fdisk-0.1-r6.ebuild 1146 RMD160 e2403c56e4ebcc228a9448169b5e037e3804c4c9 SHA1 5c97dfd699f58b5c2a4c53de366674f27eb913bd SHA256 ebdab1fbfd6f5ff18a875f11598651a0cfb797d9041a1fc3193f7807ff5cd6d7 +MD5 2253ec64201ec10a15f3dd03c27bf046 mac-fdisk-0.1-r6.ebuild 1146 +RMD160 e2403c56e4ebcc228a9448169b5e037e3804c4c9 mac-fdisk-0.1-r6.ebuild 1146 +SHA256 ebdab1fbfd6f5ff18a875f11598651a0cfb797d9041a1fc3193f7807ff5cd6d7 mac-fdisk-0.1-r6.ebuild 1146 +MISC ChangeLog 3910 RMD160 cb79b4f4c14bf29e1d4a8a46abb25a628a04e424 SHA1 8e069a14ba6c8041e125d14d045d8284908c3c09 SHA256 c9f91e8eff190ed00d7d2b8ca675aa27b56a841ca431deecdd8bb48447518e63 +MD5 c4c488318953a26d779bbeeeac5f2f1e ChangeLog 3910 +RMD160 cb79b4f4c14bf29e1d4a8a46abb25a628a04e424 ChangeLog 3910 +SHA256 c9f91e8eff190ed00d7d2b8ca675aa27b56a841ca431deecdd8bb48447518e63 ChangeLog 3910 MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 metadata.xml 156 @@ -43,9 +47,9 @@ MD5 9dd208db7d1b154e282ff01e7324d24d files/digest-mac-fdisk-0.1-r6 503 RMD160 970fb7d5a3a2a52f8606a8fbe17ecfbeb4d06934 files/digest-mac-fdisk-0.1-r6 503 SHA256 e3eebbe6ad663851fdb4ca00a91b7094ef033277b5eaadee2d830656b9f0155f files/digest-mac-fdisk-0.1-r6 503 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF0ip4kT4lNIS36YERAjZlAJ0aaXQrkpyHncXlOBlPvuM3xgtiIACeP6ep -zOjncqhg5Oc2gYyfFujQG8w= -=Uwke +iD8DBQFGF8ZjcsIHjyDViGQRAnybAJ9T7Z75WvIkcm98+anPfK8skKhJ3wCeM1yS +oUYJoHhe3M2ir7cZx+LCb18= +=wfkE -----END PGP SIGNATURE----- diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-amd64.patch b/sys-fs/mac-fdisk/files/mac-fdisk-amd64.patch new file mode 100644 index 000000000000..ecc37a19a68e --- /dev/null +++ b/sys-fs/mac-fdisk/files/mac-fdisk-amd64.patch @@ -0,0 +1,193 @@ +diff -Naur mac-fdisk-0.1.bak/fdisklabel.c mac-fdisk-0.1/fdisklabel.c +--- mac-fdisk-0.1.bak/fdisklabel.c 2007-03-16 10:56:26.000000000 -0400 ++++ mac-fdisk-0.1/fdisklabel.c 2007-03-16 10:56:13.000000000 -0400 +@@ -72,7 +72,7 @@ + static int bsd_readlabel (struct partition *p, struct disklabel *d); + static int bsd_writelabel (struct partition *p, struct disklabel *d); + static void sync_disks (void); +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + static int bsd_translate_fstype (int linux_type); + static void bsd_link_part (void); + #endif +@@ -82,7 +82,7 @@ + + static struct disklabel bsd_dlabel; + static char buffer[BSD_BBSIZE]; +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + static struct partition *bsd_part; + static int bsd_part_index; + #endif +@@ -99,13 +99,13 @@ + " n add a new BSD partition\n" + " p print BSD partition table\n" + " q quit without saving changes\n" +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + " r return to main menu\n" + #endif + " s show complete disklabel\n" + " t change a partition's filesystem id\n" + " w write disklabel to disk\n" +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + " x link BSD partition to non-BSD partition" + #endif + ); +@@ -114,7 +114,7 @@ + void + bselect (void) + { +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + int t; + + for (t=0; t<4; t++) +@@ -185,7 +185,7 @@ + case 'w': + bsd_write_disklabel (); + break; +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + case 'r': + return; + case 'x': +@@ -223,7 +223,7 @@ + if (!bsd_check_new_partition (&i)) + return; + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + begin = bsd_part -> start_sect; + end = begin + bsd_part -> nr_sects - 1; + #elif defined (__alpha__) || defined (__powerpc__) +@@ -257,7 +257,7 @@ + + if (show_all) + { +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + fprintf(f, "# %s%d:\n", disk_device, bsd_part_index+1); + #elif defined (__alpha__) || defined (__powerpc__) + fprintf(f, "# %s:\n", disk_device); +@@ -352,7 +352,7 @@ + static void + bsd_write_disklabel (void) + { +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + printf ("Writing disklabel to %s%d.\n", disk_device, bsd_part_index+1); + bsd_writelabel (bsd_part, &bsd_dlabel); + #elif defined (__alpha__) || defined (__powerpc__) +@@ -366,7 +366,7 @@ + { + char c; + +-#if defined (i386) ++#if defined (i386) || defined(__amd64) + fprintf (stderr, "%s%d contains no disklabel.\n", + disk_device, bsd_part_index+1); + #elif defined (__alpha__) || defined (__powerpc__) +@@ -376,7 +376,7 @@ + while (1) + if ((c = tolower (read_char ("Do you want to create a disklabel? (y/n) "))) == 'y') + { +-#if defined (i386) ++#if defined (i386) || defined(__amd64) + if (bsd_initlabel (bsd_part, &bsd_dlabel, bsd_part_index) == 1) + #elif defined (__alpha__) || defined (__powerpc__) || defined (__mc68000__) + if (bsd_initlabel (NULL, &bsd_dlabel, 0) == 1) +@@ -507,7 +507,7 @@ + + bcopy (&dl, d, sizeof (struct disklabel)); + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + sector = bsd_part -> start_sect; + #elif defined (__powerpc__) + sector = 0; +@@ -521,7 +521,7 @@ + if (BSD_BBSIZE != write (fd, buffer, BSD_BBSIZE)) + fatal (unable_to_write); + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + printf ("Bootstrap installed on %s%d.\n", disk_device, bsd_part_index+1); + #elif defined (__alpha__) || defined (__powerpc__) + printf ("Bootstrap installed on %s.\n", disk_device); +@@ -625,7 +625,7 @@ + d -> d_subtype = BSD_DSTYPE_INDOSPART & pindex; + #endif + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + d -> d_flags = BSD_D_DOSPART; + #else + d -> d_flags = 0; +@@ -648,7 +648,7 @@ + d -> d_bbsize = BSD_BBSIZE; + d -> d_sbsize = BSD_SBSIZE; + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + d -> d_npartitions = 4; + pp = &d -> d_partitions[2]; /* Partition C should be the NetBSD partition */ + pp -> p_offset = p -> start_sect; +@@ -674,7 +674,7 @@ + { + int t, sector; + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + sector = p -> start_sect; + #elif defined (__alpha__) || defined (__powerpc__) + sector = 0; +@@ -708,7 +708,7 @@ + { + int sector; + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + sector = p -> start_sect + BSD_LABELSECTOR; + #elif defined (__alpha__) || defined (__powerpc__) + sector = BSD_LABELSECTOR; +@@ -749,7 +749,7 @@ + sleep (4); + } + +-#if defined (i386) ++#if defined (i386) || defined (__amd64) + static int + bsd_translate_fstype (int linux_type) + { +diff -Naur mac-fdisk-0.1.bak/fdisklabel.h mac-fdisk-0.1/fdisklabel.h +--- mac-fdisk-0.1.bak/fdisklabel.h 2007-03-16 10:56:26.000000000 -0400 ++++ mac-fdisk-0.1/fdisklabel.h 2007-03-16 10:56:13.000000000 -0400 +@@ -35,7 +35,7 @@ + #define BSD_MAXPARTITIONS 8 + #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" + +-#if defined (i386) ++#if defined (i386) || defined(__amd64) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 + #define BSD_BBSIZE 8192 /* size of boot area, with label */ +diff -Naur mac-fdisk-0.1.bak/kernel-defs.h mac-fdisk-0.1/kernel-defs.h +--- mac-fdisk-0.1.bak/kernel-defs.h 2007-03-16 10:56:26.000000000 -0400 ++++ mac-fdisk-0.1/kernel-defs.h 2007-03-16 10:56:13.000000000 -0400 +@@ -15,8 +15,14 @@ + /* from asm/ioctl.h */ + #define _IOC_NRBITS 8 + #define _IOC_TYPEBITS 8 ++ ++#ifndef _IOC_SIZEBITS + #define _IOC_SIZEBITS 13 ++#endif ++ ++#ifndef _IOC_DIRBITS + #define _IOC_DIRBITS 3 ++#endif + + #define _IOC_NRMASK ((1 << _IOC_NRBITS)-1) + #define _IOC_TYPEMASK ((1 << _IOC_TYPEBITS)-1) diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild index 5b6addc81745..e1c1f3dd4d28 100644 --- a/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild +++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild,v 1.6 2007/02/13 21:15:30 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild,v 1.7 2007/04/07 16:27:25 josejx Exp $ inherit eutils @@ -21,13 +21,16 @@ src_unpack() { unpack mac-fdisk_${PV}.orig.tar.gz mv mac-fdisk-${PV}.orig ${P} cd "${S}" - epatch "${DISTDIR}"/mac-fdisk_${PV}-${DEBRV}.diff.gz + epatch "${DISTDIR}"/${PN}_${PV}-${DEBRV}.diff.gz epatch "${FILESDIR}"/largerthan2gb.patch epatch "${FILESDIR}"/${P}-headers.patch ### Patch for bug #142737 - epatch ${FILESDIR}/mac-fdisk-0.1-r6-ppc64.patch + epatch ${FILESDIR}/${PN}-0.1-r6-ppc64.patch + + ### Patch for building on amd64 + epatch ${FILESDIR}/${PN}-amd64.patch } src_install() {