I may have been too hasty in fixing the sparc build failure. (see recent cvs
activity)
After further investigation I notice that I may have broken powerpc in the
process. Not having a powerpc machine to test on I don't know if that is the
case.
I'm looking for some input.
Here's the story:
This change fixed ppc, but broke sparc:
RCS file: /cvs/debian-boot/boot-floppies/utilities/libfdisk/partbl_msdos.c,v
----------------------------
revision 1.8
date: 2001/04/13 14:15:59; author: aph; state: Exp; lines: +4 -0
a hack for building using kernel 2.4 from
[EMAIL PROTECTED]
----------------------------
Removing that change looks as follow. It fixes sparc, might break powerpc, but
at least it removes a hack:
Index: partbl_msdos.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/libfdisk/partbl_msdos.c,v
retrieving revision 1.8
diff -u -r1.8 partbl_msdos.c
--- partbl_msdos.c 2001/04/13 14:15:59 1.8
+++ partbl_msdos.c 2001/05/11 06:31:38
@@ -22,10 +22,6 @@
* frequently the case with the nr_sects and start_sect partition
* table entries.
*/
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-#define __KERNEL__
-#endif
#include <asm/unaligned.h>
#define SYS_IND(p) (get_unaligned(&p->sys_ind))
Maybe I should do this? Looks ugly, but might not break ppc:
Index: partbl_msdos.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/libfdisk/partbl_msdos.c,v
retrieving revision 1.9
diff -u -r1.9 partbl_msdos.c
--- partbl_msdos.c 2001/05/11 06:37:50 1.9
+++ partbl_msdos.c 2001/05/11 06:49:40
@@ -22,6 +22,11 @@
* frequently the case with the nr_sects and start_sect partition
* table entries.
*/
+
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)) && defined __powerpc__
+#define __KERNEL__
+#endif
#include <asm/unaligned.h>
#define SYS_IND(p) (get_unaligned(&p->sys_ind))
I eagerly await replies,
David
Fri, May 11, 2001 at 01:19:01AM -0400 wrote:
>
> I can't build the woody version on sparc:
>
>
> gcc -Wall -Os -fomit-frame-pointer -fno-builtin -c -o partbl_msdos.o partbl_msdos.c
> In file included from /usr/include/asm/string.h:11,
> from /usr/include/linux/string.h:21,
> from /usr/include/asm-sparc/unaligned.h:6,
> from /usr/include/asm/unaligned.h:11,
> from partbl_msdos.c:29:
> /usr/include/asm-sparc/string.h: In function `__constant_c_and_count_memset':
> /usr/include/asm-sparc/string.h:73: conflicting types for `__bzero'
> /usr/include/string.h:238: previous declaration of `__bzero'
> /usr/include/asm-sparc/string.h: In function `__constant_c_memset':
> /usr/include/asm-sparc/string.h:88: conflicting types for `__bzero'
> /usr/include/string.h:238: previous declaration of `__bzero'
>
>
> Can someone fix this?
>
> --
> .....Adam Di [EMAIL PROTECTED]<URL:http://www.onshored.com/>
>
>
> --
> To UNSUBSCRIBE, email to [EMAIL PROTECTED]
> with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
