Skip to content
Browse files

js:

 * convert to bin package
 * provide js binary


git-svn-id: file:///var/svn/freetz/trunk@10092 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent c5b19cd commit d8912704f2ebb0eeea750f228215e41eee109d2c er13 committed Feb 10, 2013
View
1 make/Config.in
@@ -144,6 +144,7 @@ source make/iptraf/Config.in
source make/iputils/Config.in
source make/irssi/Config.in
source make/jamvm/Config.in
+source make/js/Config.in
source make/lftp/Config.in
source make/lighttpd/Config.in
source make/lynx/Config.in
View
1 make/external.in
@@ -37,6 +37,7 @@ source make/iodine/external.in
source make/iptraf/external.in
source make/irssi/external.in
source make/jamvm/external.in
+source make/js/external.in
source make/lftp/external.in
source make/ldd/external.in
source make/lsof/external.in
View
7 make/js/Config.in
@@ -0,0 +1,7 @@
+config FREETZ_PACKAGE_JS
+ bool "OSSP js 1.6.20070208 (binary only)"
+ default n
+ select FREETZ_LIB_libjs
+ help
+ OSSP js is a stand-alone distribution of the JavaScript (JS)
+ programming language reference implementation from Mozilla.
View
2 make/libs/js/Config.in → make/js/Config.in.libs
@@ -1,5 +1,7 @@
config FREETZ_LIB_libjs
bool "libjs (libjs.so)"
+ select FREETZ_LIB_libdl
+ select FREETZ_LIB_libm
default n
help
OSSP js - Mozilla JavaScript Engine
View
1 make/libs/js/external.files → make/js/external.files
@@ -1 +1,2 @@
+[ "$EXTERNAL_FREETZ_PACKAGE_JS" == "y" ] && EXTERNAL_FILES+=" /usr/bin/js"
[ "$EXTERNAL_FREETZ_LIB_libjs" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libjs.so.1.0.6"
View
7 make/js/external.in
@@ -0,0 +1,7 @@
+config EXTERNAL_FREETZ_PACKAGE_JS
+ depends on EXTERNAL_ENABLED && FREETZ_PACKAGE_JS
+ bool "js"
+ default n
+ help
+ externals the following file(s):
+ /usr/bin/js
View
2 make/libs/js/external.in → make/js/external.in.libs
@@ -3,5 +3,5 @@ config EXTERNAL_FREETZ_LIB_libjs
bool "libjs"
default n
help
- externals these file(s):
+ externals the following file(s):
/usr/lib/freetz/libjs.so.1.0.6
View
28 make/libs/js/js.mk → make/js/js.mk
@@ -1,13 +1,16 @@
-$(call PKG_INIT_LIB, 1.6.20070208)
+$(call PKG_INIT_BIN, 1.6.20070208)
$(PKG)_LIB_VERSION:=1.0.6
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
$(PKG)_SOURCE_MD5:=07f6cad7e03fd74a949588c3d4b333de
$(PKG)_SITE:=ftp://ftp.ossp.org/pkg/lib/js
+$(PKG)_BINARY_BUILD_DIR:=$($(PKG)_DIR)/.libs/js
+$(PKG)_BINARY_TARGET_DIR:=$($(PKG)_DEST_DIR)/usr/bin/js
+
$(PKG)_LIBNAME:=lib$(pkg).so.$($(PKG)_LIB_VERSION)
-$(PKG)_BINARY:=$($(PKG)_DIR)/.libs/$($(PKG)_LIBNAME)
-$(PKG)_STAGING_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/$($(PKG)_LIBNAME)
-$(PKG)_TARGET_BINARY:=$($(PKG)_TARGET_DIR)/$($(PKG)_LIBNAME)
+$(PKG)_LIBRARY_BUILD_DIR:=$($(PKG)_DIR)/.libs/$($(PKG)_LIBNAME)
+$(PKG)_LIBRARY_STAGING_DIR:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/$($(PKG)_LIBNAME)
+$(PKG)_LIBRARY_TARGET_DIR:=$($(PKG)_TARGET_LIBDIR)/$($(PKG)_LIBNAME)
$(PKG)_CONFIGURE_OPTIONS += --enable-shared
$(PKG)_CONFIGURE_OPTIONS += --enable-static
@@ -22,23 +25,26 @@ $(PKG_SOURCE_DOWNLOAD)
$(PKG_UNPACKED)
$(PKG_CONFIGURED_CONFIGURE)
-$($(PKG)_BINARY): $($(PKG)_DIR)/.configured
+$($(PKG)_BINARY_BUILD_DIR) $($(PKG)_LIBRARY_BUILD_DIR): $($(PKG)_DIR)/.configured
$(SUBMAKE) -C $(JS_DIR)
-$($(PKG)_STAGING_BINARY): $($(PKG)_BINARY)
+$($(PKG)_LIBRARY_STAGING_DIR): $($(PKG)_LIBRARY_BUILD_DIR)
$(SUBMAKE) -C $(JS_DIR) \
DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \
install
$(PKG_FIX_LIBTOOL_LA) $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libjs.la
$(call PKG_FIX_LIBTOOL_LA,prefix) $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/js.pc
$(call PKG_FIX_LIBTOOL_LA,prefix exec_prefix js_bindir js_libdir js_includedir js_mandir js_datadir js_acdir) $(TARGET_TOOLCHAIN_STAGING_DIR)/usr/bin/js-config
-$($(PKG)_TARGET_BINARY): $($(PKG)_STAGING_BINARY)
+$($(PKG)_BINARY_TARGET_DIR): $($(PKG)_BINARY_BUILD_DIR)
+ $(INSTALL_BINARY_STRIP)
+
+$($(PKG)_LIBRARY_TARGET_DIR): $($(PKG)_LIBRARY_STAGING_DIR)
$(INSTALL_LIBRARY_STRIP)
-$(pkg): $($(PKG)_STAGING_BINARY)
+$(pkg): $($(PKG)_LIBRARY_STAGING_DIR)
-$(pkg)-precompiled: $($(PKG)_TARGET_BINARY)
+$(pkg)-precompiled: $($(PKG)_BINARY_TARGET_DIR) $($(PKG)_LIBRARY_TARGET_DIR)
$(pkg)-clean:
-$(SUBMAKE) -C $(JS_DIR) clean
@@ -49,6 +55,8 @@ $(pkg)-clean:
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include/js/
$(pkg)-uninstall:
- $(RM) $(JS_TARGET_DIR)/libjs.so*
+ $(RM) $(JS_BINARY_TARGET_DIR)
+ $(RM) $(JS_TARGET_LIBDIR)/libjs.so*
+$(call PKG_ADD_LIB,libjs)
$(PKG_FINISH)
View
0 make/libs/js/patches/005-no_libnsl.js.patch → make/js/patches/005-no_libnsl.js.patch
File renamed without changes.
View
0 ...00-config.cache-proper-dl-values.js.patch → ...00-config.cache-proper-dl-values.js.patch
File renamed without changes.
View
0 make/libs/js/patches/800-LIBS.js.patch → make/js/patches/800-LIBS.js.patch
File renamed without changes.
View
0 ...patches/810-install_library_only.js.patch → ...patches/810-install_library_only.js.patch
File renamed without changes.
View
0 make/libs/js/patches/820-jscpucfg.js.patch → make/js/patches/820-jscpucfg.js.patch
File renamed without changes.
View
0 .../libs/js/patches/840-jsautocfg.h.js.patch → make/js/patches/840-jsautocfg.h.js.patch
File renamed without changes.
View
2 make/libs/Config.in
@@ -190,7 +190,7 @@ endmenu ### "USB & FTDI"
menu "Web and WebDAV"
source make/curl/Config.in.libs
-source make/libs/js/Config.in
+source make/js/Config.in.libs
source make/libs/neon/Config.in
endmenu ### "Web and WebDAV"
View
2 make/libs/external.in
@@ -37,7 +37,7 @@ source make/libs/libiconv/external.in
source make/libs/libid3tag/external.in
source make/libs/gettext/external.in
source make/libs/jpeg/external.in
-source make/libs/js/external.in
+source make/js/external.in.libs
source make/libs/leptonica/external.in
source make/libs/libtool/external.in
source make/lua/external.in.libs
View
3 make/libs/js/Makefile.in
@@ -1,3 +0,0 @@
-ifeq ($(strip $(FREETZ_LIB_libjs)),y)
-LIBS+=js
-endif

0 comments on commit d891270

Please sign in to comment.
Something went wrong with that request. Please try again.