Christian Wiese
12 years ago
2 changed files with 2 additions and 72 deletions
Split View
Diff Options
-
+0 -70base/util-linux/util-linux-2.20.1-fdiskbsdlabel.h-IA32.patch
-
+2 -2base/util-linux/util-linux.desc
@ -1,70 +0,0 @@ |
|||
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# |
|||
# Filename: package/.../util-linux/util-linux-2.20.1-fdiskbsdlabel.h-IA32.patch |
|||
# Copyright (C) 2012 The OpenSDE Project |
|||
# |
|||
# More information can be found in the files COPYING and README. |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# --- SDE-COPYRIGHT-NOTE-END --- |
|||
|
|||
From d4f338043daecc9be92d579bc74a238d744a0247 Mon Sep 17 00:00:00 2001 |
|||
From: Christian Wiese <chris@opensde.org> |
|||
Date: Wed, 15 Feb 2012 13:39:22 +0100 |
|||
Subject: [PATCH] fdisk: fix to build for IA32 |
|||
|
|||
Tested architectures: |
|||
- i486 using gcc -march=i486
|
|||
- i586 using gcc -march=pentium-mmx
|
|||
- i686 using gcc -march={pentiumpro,pentium2,pentium3,pentium-m,pentium4}
|
|||
|
|||
Without this fix building fdisk fails for for all tested arch/cpu types |
|||
emiting following error: |
|||
------------------------------------------------------------------------------
|
|||
In file included from fdiskbsdlabel.c:62:0: |
|||
fdiskbsdlabel.h:61:2: error: #error unknown architecture |
|||
fdiskbsdlabel.c: In function 'bselect': |
|||
fdiskbsdlabel.c:180:44: error: 'BSD_LABELSECTOR' undeclared (first use in this function) |
|||
fdiskbsdlabel.c:180:44: note: each undeclared identifier is reported only once for each function it appears in |
|||
fdiskbsdlabel.c: In function 'xbsd_write_bootstrap': |
|||
fdiskbsdlabel.c:539:24: error: 'BSD_LABELSECTOR' undeclared (first use in this function) |
|||
fdiskbsdlabel.c: In function 'xbsd_readlabel': |
|||
fdiskbsdlabel.c:744:28: error: 'BSD_LABELSECTOR' undeclared (first use in this function) |
|||
fdiskbsdlabel.c:744:60: error: 'BSD_LABELOFFSET' undeclared (first use in this function) |
|||
fdiskbsdlabel.c: In function 'xbsd_writelabel': |
|||
fdiskbsdlabel.c:769:32: error: 'BSD_LABELSECTOR' undeclared (first use in this function) |
|||
fdiskbsdlabel.c:780:61: error: 'BSD_LABELOFFSET' undeclared (first use in this function) |
|||
make[2]: *** [fdisk-fdiskbsdlabel.o] Error 1 |
|||
------------------------------------------------------------------------------
|
|||
|
|||
This fix was tested with following major toolchain components: |
|||
|
|||
binutils 2.21.53.0.2 |
|||
gcc 4.6.2 |
|||
glibc 2.14.1 |
|||
---
|
|||
fdisk/fdiskbsdlabel.h | 2 +- |
|||
1 files changed, 1 insertions(+), 1 deletions(-) |
|||
|
|||
diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h
|
|||
index 9f9e091..e58e2ff 100644
|
|||
--- a/fdisk/fdiskbsdlabel.h
|
|||
+++ b/fdisk/fdiskbsdlabel.h
|
|||
@@ -46,7 +46,7 @@
|
|||
|
|||
#define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" |
|||
|
|||
-#if defined (i386) || defined (__sparc__) || defined (__arm__) || \
|
|||
+#if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
|
|||
defined (__mips__) || defined (__s390__) || defined (__sh__) || \ |
|||
defined(__x86_64__) || defined (__avr32__) || defined(__cris__) |
|||
#define BSD_LABELSECTOR 1 |
|||
--
|
|||
1.7.2.3 |
|||
|
|||