summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
author Niels Horn2011-04-03 18:35:51 +0200
committer Niels Horn2011-04-03 18:35:51 +0200
commit953083e068433d3db257a718d2930b5ffa2bc7b4 (patch)
treea4b1a845d3b07c397b073477d4291e71f5a8e432 /system
parente963b7ba48b852a2684decf3ca2ed094fc447fb1 (diff)
downloadslackbuilds-953083e068433d3db257a718d2930b5ffa2bc7b4.tar.gz
system/kqemu: Patched for kernels >= 2.6.37.x
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/kqemu/kqemu.SlackBuild7
-rw-r--r--system/kqemu/kqemu_initMUTEX.patch13
2 files changed, 19 insertions, 1 deletions
diff --git a/system/kqemu/kqemu.SlackBuild b/system/kqemu/kqemu.SlackBuild
index 599308af38..ac2f9e5b13 100644
--- a/system/kqemu/kqemu.SlackBuild
+++ b/system/kqemu/kqemu.SlackBuild
@@ -24,9 +24,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Modified by the SlackBuilds.org team
+
PRGNAM=kqemu
VERSION=${VERSION:-1.4.0pre1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,6 +73,9 @@ find . \
patch -p1 < $CWD/linux-sched.diff
+# Patch for kernels >= 2.6.37.x, thanks to the folks from Gentoo
+patch -p1 < $CWD/kqemu_initMUTEX.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/kqemu/kqemu_initMUTEX.patch b/system/kqemu/kqemu_initMUTEX.patch
new file mode 100644
index 0000000000..6d7bd0392f
--- /dev/null
+++ b/system/kqemu/kqemu_initMUTEX.patch
@@ -0,0 +1,13 @@
+--- kqemu-1.4.0pre1-orig/kqemu-linux.c 2008-05-30 16:33:34.000000000 -0400
++++ kqemu-1.4.0pre1-orig/kqemu-linux.c 2011-01-05 16:51:45.407394748 -0500
+@@ -53,6 +53,10 @@
+ #define PAGE_KERNEL_EXEC PAGE_KERNEL
+ #endif
+
++/* init_MUTEX macro was removed in 2.6.37 */
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 36) && !defined(init_MUTEX)
++#define init_MUTEX(sem) sema_init(sem, 1)
++#endif
+ //#define DEBUG
+
+ #ifdef DEBUG