From 414b4307e2ae67ec8062d825ca8bb19cd0817420 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 22 May 2009 13:09:45 +0000 Subject: [PATCH] [PATCH] fix uclib bug in jamvm I just realized that tls has some problems with ulibc. This patch disables it and uses more opewrt-style install directories for libraries. Signed-off-by: Roberto Riggio git-svn-id: svn://svn.openwrt.org/openwrt/packages@15988 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/jamvm/Makefile | 2 ++ libs/classpath/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index bf7ae8081..95b09d160 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -36,6 +36,8 @@ define Package/jamvm/description endef CONFIGURE_ARGS+= \ + --with-classpath-install-dir=/usr \ + --disable-tls \ --enable-ffi \ --disable-int-threading \ diff --git a/libs/classpath/Makefile b/libs/classpath/Makefile index 3941f0aca..e7561b0de 100644 --- a/libs/classpath/Makefile +++ b/libs/classpath/Makefile @@ -45,10 +45,10 @@ define Build/Compile endef define Package/classpath/install - $(INSTALL_DIR) $(1)/usr/local/classpath/share/classpath/ - $(INSTALL_DIR) $(1)/usr/local/classpath/lib/classpath/ - $(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/glibj.zip $(1)/usr/local/classpath/share/classpath/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/classpath/* $(1)/usr/local/classpath/lib/classpath/ + $(INSTALL_DIR) $(1)/usr/share/classpath + $(INSTALL_DIR) $(1)/usr/lib/classpath + $(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/glibj.zip $(1)/usr/share/classpath/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/classpath/* $(1)/usr/lib/classpath/ endef $(eval $(call BuildPackage,classpath)) -- 2.11.0