From 1b6a9fa3f18fdeaa3f3869a22cd91490ffec608c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Jan 2014 08:00:06 +0100 Subject: fix host build logic for non-linux --- package/alsa-lib/Makefile | 5 ++++- package/cups/Makefile | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 \ -- cgit v1.2.3 From bf73dab7201f06f26290c4ceb5cdcca603f027d7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Jan 2014 09:19:35 +0100 Subject: fix openjdk build, add render dependency --- mk/vars.mk | 2 +- package/libXrender/Makefile | 6 +++++- package/openjdk7/Makefile | 6 +++--- package/qemu/Makefile | 5 +++-- package/qemu/patches/patch-linux-user_syscall_c | 11 +++++++++++ package/renderproto/Makefile | 6 ++++++ 6 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 package/qemu/patches/patch-linux-user_syscall_c 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/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 + #include + #include +-#include ++#include + #include + #include + #include 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 -- cgit v1.2.3 From 174df1bc12ff2f24857ae43fdbb40ad449bb9bc1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Jan 2014 12:03:48 +0100 Subject: fix qemu build for older kernels --- package/qemu/Makefile | 2 +- package/qemu/patches/patch-linux-user_syscall_c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/package/qemu/Makefile b/package/qemu/Makefile index c45eea716..b03a3ca59 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -10,7 +10,7 @@ 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/ diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c index 21c9afef5..1eba70417 100644 --- a/package/qemu/patches/patch-linux-user_syscall_c +++ b/package/qemu/patches/patch-linux-user_syscall_c @@ -1,11 +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-30 12:14:53.751964593 +0100 -@@ -94,7 +94,7 @@ int __clone2(int (*fn)(void *), void *ch ++++ 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 + #include + #include ++#include + #include + #include "qemu-common.h" + #ifdef TARGET_GPROF +@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch #include #include #include --#include ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0) + #include ++#else +#include ++#endif #include #include #include -- cgit v1.2.3 From b9babb54de7c6e7466eb646517b28e998e10461e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Jan 2014 13:05:41 +0100 Subject: fix cygwin build --- package/freetype/Makefile | 1 + toolchain/gmp/Makefile | 3 +++ 2 files changed, 4 insertions(+) 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/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) \ -- cgit v1.2.3 From 8642d5d1d310f83c2717559a6829a710f0d8b396 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Jan 2014 16:04:49 +0100 Subject: set freetype path for host build --- package/openjdk7/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 701f67bca..ca9e416a5 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -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) -- cgit v1.2.3