summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/vars.mk2
-rw-r--r--package/alsa-lib/Makefile5
-rw-r--r--package/cups/Makefile4
-rw-r--r--package/freetype/Makefile1
-rw-r--r--package/libXrender/Makefile6
-rw-r--r--package/openjdk7/Makefile6
-rw-r--r--package/qemu/Makefile7
-rw-r--r--package/qemu/patches/patch-linux-user_syscall_c22
-rw-r--r--package/renderproto/Makefile6
-rw-r--r--toolchain/gmp/Makefile3
10 files changed, 54 insertions, 8 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index 23cc018f0..796274bb9 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -218,7 +218,7 @@ QUIET:=
else
QUIET:= --quiet
endif
-FETCH_CMD?= wget --timeout=10 -t 3 $(QUIET)
+FETCH_CMD?= wget --timeout=40 -t 3 $(QUIET)
ifeq ($(ADK_HOST_CYGWIN),y)
EXEEXT:= .exe
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index a681ddb39..f4f798344 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -22,8 +22,11 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call HOST_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-HOST_STYLE:= auto
+ifneq ($(ADK_HOST_LINUX),y)
HOST_LINUX_ONLY:= 1
+endif
+
+HOST_STYLE:= auto
TARGET_CPPFLAGS+= -D_POSIX_C_SOURCE=1
CONFIGURE_ARGS+= --disable-python
diff --git a/package/cups/Makefile b/package/cups/Makefile
index e3fc672e9..4d83cf472 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -24,6 +24,10 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+ifneq ($(ADK_HOST_LINUX),y)
+HOST_LINUX_ONLY:= 1
+endif
+
HOST_STYLE:= auto
HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \
--disable-webif \
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 492adb046..55fdd98af 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -27,6 +27,7 @@ $(eval $(call HOST_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE
$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
HOST_STYLE:= auto
+HOST_CONFIGURE_ARGS+= --without-png
CONFIGURE_ARGS+= --without-png
libfreetype-install:
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 bdb34b0f0..ca9e416a5 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
@@ -101,7 +101,9 @@ OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_
OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj
OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip"
OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
- ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include"
+ ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \
+ ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include"
+
HOST_STYLE:= auto
HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV)
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 48cb6e82b..b03a3ca59 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,13 +4,13 @@
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
-PKG_BUILDDEP:= glib-host qemu-host zlib sdl libpng
+PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host qemu-host zlib sdl libpng
PKG_URL:= http://wwww.qemu.org/
PKG_SITES:= http://wiki.qemu.org/download/
@@ -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..1eba70417
--- /dev/null
+++ b/package/qemu/patches/patch-linux-user_syscall_c
@@ -0,0 +1,22 @@
+--- 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-31 09:51:34.051058876 +0100
+@@ -64,6 +64,7 @@ int __clone2(int (*fn)(void *), void *ch
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+ #include <linux/wireless.h>
++#include <linux/version.h>
+ #include <linux/icmp.h>
+ #include "qemu-common.h"
+ #ifdef TARGET_GPROF
+@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch
+ #include <linux/utsname.h>
+ #include <linux/cdrom.h>
+ #include <linux/hdreg.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
+ #include <linux/soundcard.h>
++#else
++#include <linux/soundcard.h.oss3>
++#endif
+ #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
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
index 22e5070be..33982ed17 100644
--- a/toolchain/gmp/Makefile
+++ b/toolchain/gmp/Makefile
@@ -12,6 +12,9 @@ endif
$(WRKBUILD)/.headers:
$(WRKBUILD)/.configured:
+ifneq ($(OStype),Darwin)
+ (cd $(WRKBUILD); cp configfsf.guess config.guess)
+endif
(cd $(WRKBUILD); \
./configure \
--prefix=$(STAGING_HOST_DIR) \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 10:54:17 +0000