summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/libXrender/Makefile6
-rw-r--r--package/openjdk7/Makefile6
-rw-r--r--package/qemu/Makefile5
-rw-r--r--package/qemu/patches/patch-linux-user_syscall_c11
-rw-r--r--package/renderproto/Makefile6
5 files changed, 28 insertions, 6 deletions
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 75c3fbf7a..45de708ad 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= b6702e6f56f9d9103dc688f4336529a9
PKG_DESCR:= X11 rendering library
PKG_SECTION:= x11/libs
-PKG_BUILDDEP:= renderproto libX11
+PKG_BUILDDEP:= renderproto-host libXrender-host renderproto libX11
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_LIBNAME:= libxrender
PKG_OPTS:= dev
@@ -18,14 +18,18 @@ ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+HOST_STYLE:= auto
CONFIGURE_ARGS+= --disable-malloc0returnsnull
libxrender-install:
${INSTALL_DIR} ${IDIR_LIBXRENDER}/usr/lib
${CP} ${WRKINST}/usr/lib/libXrender.so* ${IDIR_LIBXRENDER}/usr/lib
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index b4851014b..9a1294329 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= lang
PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host
PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host
PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host
-PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host
+PKG_BUILDDEP+= renderproto-host libXrender-host alsa-lib-host libffi-host gcj-host ecj-host jikes-host
PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host
PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
@@ -27,8 +27,8 @@ GCJ_VER:= 4.7.3
PKG_HOST_DEPENDS:= linux
PKG_ARCH_DEPENDS:= arm mips ppc sparc x86 x86_64
-PKG_LIBC_DEPENDS:= uclicb eglibc glibc
-PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong
+PKG_LIBC_DEPENDS:= uclibc eglibc glibc
+PKG_SYSTEM_DEPENDS:= !lemote-yeelong
include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 48cb6e82b..c45eea716 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= qemu
-PKG_VERSION:= 1.6.1
+PKG_VERSION:= 1.7.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3a897d722457c5a895cd6ac79a28fda0
+PKG_MD5SUM:= 32893941d40d052a5e649efcf06aca06
PKG_DESCR:= cpu and system emulator
PKG_SECTION:= misc
PKG_DEPENDS:= zlib libsdl libpng
@@ -37,6 +37,7 @@ CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \
HOST_STYLE:= manual
HOST_CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \
--disable-docs \
+ --disable-werror \
--disable-system \
--disable-sdl
diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c
new file mode 100644
index 000000000..21c9afef5
--- /dev/null
+++ b/package/qemu/patches/patch-linux-user_syscall_c
@@ -0,0 +1,11 @@
+--- qemu-1.7.0.orig/linux-user/syscall.c 2013-11-27 23:15:55.000000000 +0100
++++ qemu-1.7.0/linux-user/syscall.c 2014-01-30 12:14:53.751964593 +0100
+@@ -94,7 +94,7 @@ int __clone2(int (*fn)(void *), void *ch
+ #include <linux/utsname.h>
+ #include <linux/cdrom.h>
+ #include <linux/hdreg.h>
+-#include <linux/soundcard.h>
++#include <linux/soundcard.h.oss3>
+ #include <linux/kd.h>
+ #include <linux/mtio.h>
+ #include <linux/fs.h>
diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile
index 3f744dafc..187f7848d 100644
--- a/package/renderproto/Makefile
+++ b/package/renderproto/Makefile
@@ -8,12 +8,18 @@ PKG_VERSION:= 0.11.1
PKG_RELEASE:= 1
PKG_DESCR:= X Rendering Extension headers
PKG_SECTION:= devel
+PKG_BUILDDEP:= renderproto-host
PKG_MD5SUM:= 9b103359123e375bb7760f7dbae3dece
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_OPTS:= dev devonly
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,RENDERPROTO,renderproto,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,RENDERPROTO,renderproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+HOST_STYLE:= auto
+
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk