haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

qemu: fixes x86_64 and clean up dependencies.

Browse Source
This commit is contained in:
Jerome Duval
2014-09-06 21:46:56 +00:00
parent 2ea06b7c0a
commit 9995014d71
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app-emulation/qemu/patches/qemu-2.1.0.patchset
View File

@@ -1,4 +1,4 @@
From d8309fef75f016c5c966ce36d9241d0a4575c2f1 Mon Sep 17 00:00:00 2001
From 5a9ff734d38b382f532b485f68dc84a3ab361549 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 31 Aug 2014 11:17:41 +0000
Subject: haiku patch
@@ -174,7 +174,7 @@ index 4c53211..d7c43c4 100644
1.8.3.4
From 6a512cf0e0055906fdea441cafff88560c008036 Mon Sep 17 00:00:00 2001
From e0895f808d4c77cc8630d657eef0275d8e3d7333 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 31 Aug 2014 11:23:00 +0000
Subject: sys/signal.h =>
@@ -197,7 +197,7 @@ index cdbfb2e..6779c03 100644
1.8.3.4
From f6796fe2bf569f41c8f6cfe13d2214cc64099411 Mon Sep 17 00:00:00 2001
From f832224f8dc050d8bab5cf71bd4a358d3b3f27bb Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 1 Sep 2014 07:28:08 +0000
Subject: we use libbsd instead of libutil
@@ -219,3 +219,29 @@ index 4b2e1bb..ac248d0 100644
--
1.8.3.4
From c2ca444897e667046f3c266feb7489317f27d403 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 6 Sep 2014 20:35:22 +0000
Subject: adapt configure for x86_64
* define _POSIX_C_SOURCE for memalign
diff --git a/configure b/configure
index f7685b5..3c063fb 100755
--- a/configure
+++ b/configure
@@ -659,8 +659,9 @@ AIX)
;;
Haiku)
haiku="yes"
+ CFLAGS="$CFLAGS -D_POSIX_C_SOURCE"
QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS"
- LIBS="-lposix_error_mapper -lnetwork $LIBS"
+ LIBS="-lposix_error_mapper -lnetwork -lbsd $LIBS"
;;
*)
audio_drv_list="oss"
--
1.8.3.4

12
app-emulation/qemu/qemu-2.1.0.recipe
View File

@@ -11,7 +11,7 @@ SRC_URI="http://wiki.qemu-project.org/download/qemu-$portVersion.tar.bz2"
CHECKSUM_SHA256="397e23184f4bf613589a8fe0c6542461dc2afdf17ed337e97e6fd2f31e8f8802"
COPYRIGHT="2003-2014 Fabrice Bellard"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -62,16 +62,16 @@ REQUIRES="
lib:libintl$secondaryArchSuffix
lib:libstdc++$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
glib2$secondaryArchSuffix >= 2.12
pixman$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix >= 0.38
lib:libpixman_1$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libz$secondaryArchSuffix
devel:libfdt$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
glib2${secondaryArchSuffix}_devel >= 2.12
pixman${secondaryArchSuffix}_devel
devel:libglib_2.0$secondaryArchSuffix >= 0.38
devel:libpixman_1${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
@@ -89,7 +89,7 @@ BUILD_PREREQUIRES="
BUILD()
{
runConfigure --omit-buildspec ./configure
make $jobArgs LDFLAGS=-lbsd
make $jobArgs
}
INSTALL()