diff options
| -rw-r--r-- | package/libXtst/Makefile | 4 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 17 |
2 files changed, 3 insertions, 18 deletions
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 \ |