Attachment 619965 Details for Bug 749428 – Patch

[patch] Patch

0001-Build-everthing-from-source.patch (text/plain), 4.28 KB, created by jmccann on 2012-10-01 19:29:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jmccann

Created: 2012-10-01 19:29:51 UTC

Size: 4.28 KB

patch

obsolete

>From 00b72b1f3f64dd0b1eb1b2403e1dd2eaa1a4b982 Mon Sep 17 00:00:00 2001
>From: Jon McCann <jmccann@redhat.com>
>Date: Thu, 20 Sep 2012 20:54:17 -0400
>Subject: [PATCH] Build everthing from source
>
>---
> 0001-win32-add-new-mingw-prefix.patch              | 31 ++++++++++++++++++++++
> ...2-assume-STORAGE_DEVICE_NUMBER-is-defined.patch | 30 +++++++++++++++++++++
> syslinux.spec                                      | 11 +++++---
> 3 files changed, 69 insertions(+), 3 deletions(-)
> create mode 100644 0001-win32-add-new-mingw-prefix.patch
> create mode 100644 0001-win32-assume-STORAGE_DEVICE_NUMBER-is-defined.patch
>
>diff --git a/0001-win32-add-new-mingw-prefix.patch b/0001-win32-add-new-mingw-prefix.patch
>new file mode 100644
>index 0000000..cf56d19
>--- /dev/null
>+++ b/0001-win32-add-new-mingw-prefix.patch
>@@ -0,0 +1,31 @@
>+From b3bb9769778a7cf47ff5d62fddcbac06cc4c7388 Mon Sep 17 00:00:00 2001
>+From: Paulo Alcantara <pcacjr@gmail.com>
>+Date: Thu, 26 Jan 2012 14:14:50 -0300
>+Subject: [PATCH] win32: add new mingw prefix
>+
>+This prefix is used on at least Ubuntu 12.04 when installing the
>+mingw-w64 package.
>+
>+Signed-off-by: Paulo Alcantara <pcacjr@gmail.com>
>+Reported-by: Gert Hulselmans <hulselmansgert@gmail.com>
>+---
>+ win32/find-mingw32.sh | 3 ++-
>+ 1 file changed, 2 insertions(+), 1 deletion(-)
>+
>+diff --git a/win32/find-mingw32.sh b/win32/find-mingw32.sh
>+index f79949c..51dcdd7 100755
>+--- a/win32/find-mingw32.sh
>++++ b/win32/find-mingw32.sh
>+@@ -20,7 +20,8 @@ for prefix in \
>+     i386-mingw32msvc- \
>+     i486-mingw32msvc- \
>+     i586-mingw32msvc- \
>+-    i686-mingw32msvc-; do
>++    i686-mingw32msvc- \
>++    i686-w64-mingw32-; do
>+     if "${prefix}${cc}" -v > /dev/null 2>&1; then
>+ 	echo "$prefix"
>+ 	exit 0
>+-- 
>+1.7.11.4
>+
>diff --git a/0001-win32-assume-STORAGE_DEVICE_NUMBER-is-defined.patch b/0001-win32-assume-STORAGE_DEVICE_NUMBER-is-defined.patch
>new file mode 100644
>index 0000000..53608cc
>--- /dev/null
>+++ b/0001-win32-assume-STORAGE_DEVICE_NUMBER-is-defined.patch
>@@ -0,0 +1,30 @@
>+From 2a2fd4f65be041d467532c0f19325978dbda7a5b Mon Sep 17 00:00:00 2001
>+From: "H. Peter Anvin" <hpa@zytor.com>
>+Date: Wed, 27 Jun 2012 08:01:47 -0700
>+Subject: [PATCH] win32: assume STORAGE_DEVICE_NUMBER is defined
>+
>+If using mingw-w64 to build for win32, this will be defined.  This is
>+confusing, especially since mingw-w64 defined __MINGW32__ but nothing
>+else... thus hide this definition for now.
>+
>+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
>+---
>+ win/syslinux.c | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/win/syslinux.c b/win/syslinux.c
>+index 26e5a27..c0c4fb2 100644
>+--- a/win/syslinux.c
>++++ b/win/syslinux.c
>+@@ -50,7 +50,7 @@ void error(char *msg);
>+ // The following struct should be in the ntddstor.h file, but I didn't have it.
>+ // mingw32 has <ddk/ntddstor.h>, but including that file causes all kinds
>+ // of other failures.  mingw64 has it in <winioctl.h>.
>+-#ifndef __x86_64__
>++#if 0 /* Until we can figure out how to auto-detect this? */
>+ typedef struct _STORAGE_DEVICE_NUMBER {
>+     DEVICE_TYPE DeviceType;
>+     ULONG DeviceNumber;
>+-- 
>+1.7.11.4
>+
>diff --git a/syslinux.spec b/syslinux.spec
>index c760561..2642914 100644
>--- a/syslinux.spec
>+++ b/syslinux.spec
>@@ -12,6 +12,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs
> BuildRequires: /usr/include/gnu/stubs-32.h
> BuildRequires: libuuid-devel
>+BuildRequires: mingw32-gcc
> %ifarch %{ix86}
> Requires: mtools, libc.so.6
> %endif
>@@ -21,6 +22,8 @@ Requires: mtools, libc.so.6()(64bit)
> 
> Patch1: syslinux-isohybrid-fix-mbr.patch
> Patch2: syslinux-4.05-avoid-ext2_fs.h.patch
>+Patch90: 0001-win32-add-new-mingw-prefix.patch
>+Patch91: 0001-win32-assume-STORAGE_DEVICE_NUMBER-is-defined.patch
> 
> # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
> # a system bootloader, and may be necessary for system recovery.
>@@ -69,13 +72,15 @@ booting in the /tftpboot directory.
> 
> %patch1 -p1 -b .isohyb
> %patch2 -p1 -b .ext2
>+%patch90 -p1 -b .version
>+%patch91 -p1 -b .headers
> 
> %build
> CFLAGS="-Werror -Wno-unused -finline-limit=2000"
> export CFLAGS
>-# If you make clean here, we lose the provided syslinux.exe
>-#make clean
>-make installer
>+# clean out the provided binaries and make our own
>+make spotless
>+make all
> make -C sample tidy
> 
> %install
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 749428: 619965