diff --git a/app-emulation/qemu/patches/qemu-1.7.0.patchset b/app-emulation/qemu/patches/qemu-1.7.0.patchset new file mode 100644 index 000000000..69f7279ea --- /dev/null +++ b/app-emulation/qemu/patches/qemu-1.7.0.patchset @@ -0,0 +1,63 @@ +From 4656339211c608955f9dbbabf4c6a9456f20fd64 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 26 Feb 2014 17:02:49 +0000 +Subject: Haiku: adapt configure for x86_64 + +* don't hardcode arch/cpu. +* define _POSIX_C_SOURCE for memalign. + +diff --git a/configure b/configure +index 2f11a10..59ed591 100755 +--- a/configure ++++ b/configure +@@ -583,7 +583,7 @@ Haiku) + sysconfdir="${prefix}/etc" + bindir="${prefix}" + confsuffix="" +- CFLAGS="-fno-pic -march=prescott -mtune=core2 $CFLAGS" ++ CFLAGS="$CFLAGS -D_POSIX_C_SOURCE" + QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS" + LIBS="-lposix_error_mapper -lnetwork -lbe -lbsd -lgame -lmedia -lstdc++ $LIBS" + ;; +-- +1.8.3.4 + + +From 8d6f0e83ae6e429a1407b991772e3be40df292a0 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 26 Feb 2014 17:19:05 +0000 +Subject: Haiku: don't hardcode types. + + +diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h +index a445506..f3927e2 100644 +--- a/include/fpu/softfloat.h ++++ b/include/fpu/softfloat.h +@@ -55,24 +55,12 @@ these four paragraphs for those parts of this code that are retained. + | to the same as `int'. + *----------------------------------------------------------------------------*/ + typedef uint8_t flag; +-#ifndef __HAIKU__ + typedef uint8_t uint8; + typedef int8_t int8; + typedef unsigned int uint32; + typedef signed int int32; + typedef uint64_t uint64; + typedef int64_t int64; +-#else +-// Haiku types +-typedef signed char int8; +-typedef unsigned char uint8; +-typedef short int16; +-typedef unsigned short uint16; +-typedef long int32; +-typedef unsigned long uint32; +-typedef long long int64; +-typedef unsigned long long uint64; +-#endif + + #define LIT64( a ) a##LL + #define INLINE static inline +-- +1.8.3.4 + diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe index 74725b0af..d2634ff42 100644 --- a/app-emulation/qemu/qemu-1.7.0.recipe +++ b/app-emulation/qemu/qemu-1.7.0.recipe @@ -7,7 +7,9 @@ SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b1 COPYRIGHT="2003-2008 Fabrice Bellard" LICENSE="GNU GPL v2" REVISION="1" -ARCHITECTURES="x86" +ARCHITECTURES="x86 x86_64" + +PATCHES="qemu-1.7.0.patchset" PROVIDES=" qemu = $portVersion @@ -59,6 +61,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:awk cmd:gcc cmd:ld cmd:make diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe index d3250e9ad..d3d140368 100644 --- a/sys-apps/dtc/dtc-1.4.0.recipe +++ b/sys-apps/dtc/dtc-1.4.0.recipe @@ -8,7 +8,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="2005 David Gibson, IBM Corporation" REVISION="1" -ARCHITECTURES="x86" +ARCHITECTURES="x86 x86_64" PROVIDES=" dtc = $portVersion diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe index 32524beed..4770240af 100644 --- a/sys-devel/bison/bison-2.5.recipe +++ b/sys-devel/bison/bison-2.5.recipe @@ -17,7 +17,7 @@ SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz" CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4" REVISION="1" -ARCHITECTURES="?x86" +ARCHITECTURES="?x86 x86_64" PATCHES="bison-${portVersion}.patch" diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe index 0373ac2c7..b5046ee3e 100644 --- a/x11-libs/pixman/pixman-0.20.0.recipe +++ b/x11-libs/pixman/pixman-0.20.0.recipe @@ -15,7 +15,7 @@ COPYRIGHT="1987-1998 The Open Group REVISION="1" -ARCHITECTURES="x86" +ARCHITECTURES="x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES="