From 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 23 Jan 2014 08:12:50 +0100 Subject: remove jtools/java host dir. use host stuff instead. fix arm building. --- package/libXtst/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'package/libXtst/Makefile') diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index 5a9c07704..75ec95913 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -9,19 +9,23 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b PKG_DESCR:= Xtst library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= recordproto libXi +PKG_BUILDDEP:= recordproto-host recordproto libXi libXi-host libXtst-host PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxtst PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --disable-malloc0returnsnull libxtst-install: ${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib ${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 34d49891c4660e4285d9755e2e35b481b8b277b5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 17:14:27 +0100 Subject: fix more host dependencies --- package/libXtst/Makefile | 3 ++- package/openjdk7/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'package/libXtst/Makefile') diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index 75ec95913..70c7f3393 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -9,7 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b PKG_DESCR:= Xtst library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= recordproto-host recordproto libXi libXi-host libXtst-host +PKG_BUILDDEP:= recordproto-host libXi-host libXtst-host +PKG_BUILDDEP+= recordproto libXi PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxtst PKG_OPTS:= dev diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 292ae8553..584fda165 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= OpenJDK 7 Java VM 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 libXtst-host freetype-host +PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host-compile libXi-host-compile libXtst-host freetype-host PKG_BUILDDEP+= alsa-lib-host libffi-host gcj-host ecj-host jikes-host PKG_BUILDDEP+= classpath-host jamvm-host ant-host openjdk7-host PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups -- cgit v1.2.3 From 395027c0eca327aa515ec95131218f017ed376e8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 27 Jan 2014 09:48:17 +0100 Subject: disable choices for now, need rework --- package/libXtst/Makefile | 4 +++- package/openjdk7/Makefile | 17 ----------------- 2 files changed, 3 insertions(+), 18 deletions(-) (limited to 'package/libXtst/Makefile') diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile index 70c7f3393..913fbdee6 100644 --- a/package/libXtst/Makefile +++ b/package/libXtst/Makefile @@ -9,7 +9,9 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 8918809e47c29b44d25eb16b1586a15b PKG_DESCR:= Xtst library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= recordproto-host libXi-host libXtst-host +PKG_BUILDDEP:= recordproto-host xproto-host xextproto-host inputproto-host kbproto-host +PKG_BUILDDEP+= xtrans-host xcb-proto-host libXau-host libpthread-stubs-host libxcb-host +PKG_BUILDDEP+= libX11-host libXext-host libXi-host libXtst-host PKG_BUILDDEP+= recordproto libXi PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxtst diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 7db33966f..b4851014b 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -30,13 +30,6 @@ 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_SUBPKGS:= OPENJDK7 -PKG_CHOICES_OPENJDK7:= ZERO SHARK CACAO -PKGCD_ZERO:= zero-assembly backend -PKGCD_SHARK:= Shark JIT backend (needs eglibc/glibc) -PKGCB_SHARK:= llvm -PKGCD_CACAO:= Cacao JIT backend - include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk include $(TOPDIR)/mk/qemu.mk @@ -60,17 +53,7 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) JDKARCH:= mipsel endif -ifeq ($(ADK_PACKAGE_OPENJDK7_ZERO),y) CONFIGURE_BACKEND:= --enable-zero -endif -ifeq ($(ADK_PACKAGE_OPENJDK7_SHARK),y) -CONFIGURE_BACKEND:= --enable-shark \ - --with-llvm-config=$(STAGING_TARGET_DIR)/usr/bin/llvm-config -endif -ifeq ($(ADK_PACKAGE_OPENJDK7_CACAO),y) -CONFIGURE_BACKEND:= --enable-cacao -endif - CONFIGURE_COMMON:= --disable-docs \ --with-jdk-home=$(BOOTSTRAPJDK) \ --with-java=$(BOOTSTRAPJDK)/bin/java \ -- cgit v1.2.3