summaryrefslogtreecommitdiffhomepage
path: root/contrib
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-25 12:52:55 +0000
committerSteven Barth <steven@midlink.org>2008-09-25 12:52:55 +0000
commit54dc86d99c2a66238569d39dfc0e9a3d00f8ebcb (patch)
treeceabd94815397bd42f5d10321f4896ad82f2dfa4 /contrib
parent45ca64b2504f3646cdff261aa7c31d89df209c46 (diff)
Remove unneeded dependencies
Diffstat (limited to 'contrib')
-rw-r--r--contrib/package/bitlib/Makefile48
-rw-r--r--contrib/package/luaposix/Makefile44
-rw-r--r--contrib/package/luaposix/patches/200-crypt.patch62
-rw-r--r--contrib/package/luci/Makefile2
4 files changed, 1 insertions, 155 deletions
diff --git a/contrib/package/bitlib/Makefile b/contrib/package/bitlib/Makefile
deleted file mode 100644
index 9213ed5f6..000000000
--- a/contrib/package/bitlib/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bitlib
-PKG_VERSION:=25
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dev.luci.freifunk-halle.net/sources/\
- http://luaforge.net/frs/download.php/3065
-PKG_MD5SUM:=18f124c80c685f2269296a7172e600fe
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bitlib
- SECTION:=lang
- CATEGORY:=Languages
- SUBMENU:=LUA
- TITLE:=bit manipulation library
- URL:=http://luaforge.net/projects/bitlib
- DEPENDS:=+liblua
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
- $(CP) $(PKG_BUILD_DIR)/config.h.in $(PKG_BUILD_DIR)/config.h
- $(TARGET_CC) $(TARGET_CFLAGS) -DHAVE_CONFIG_H -I$(PKG_BUILD_DIR) -Wall -pedantic \
- -I$(STAGING_DIR)/usr/include/ -c $(PKG_BUILD_DIR)/lbitlib.c -fPIC -o $(PKG_BUILD_DIR)/lbitlib.o
- $(TARGET_CC) $(TARGET_LDFLAGS) -shared $(PKG_BUILD_DIR)/lbitlib.o -o $(PKG_BUILD_DIR)/bit.so
-endef
-
-define Package/bitlib/install
- $(INSTALL_DIR) $(1)/usr/lib/lua
- $(CP) $(PKG_BUILD_DIR)/bit.so $(1)/usr/lib/lua
-endef
-
-$(eval $(call BuildPackage,bitlib))
diff --git a/contrib/package/luaposix/Makefile b/contrib/package/luaposix/Makefile
deleted file mode 100644
index 348fe23f7..000000000
--- a/contrib/package/luaposix/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=luaposix
-PKG_VERSION:=5.1.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dev.luci.freifunk-halle.net/sources/\
- http://luaforge.net/frs/download.php/3449
-PKG_MD5SUM:=4271f321c39d0560d9fbe6ca882a67aa
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luaposix
- SECTION:=lang
- CATEGORY:=Languages
- SUBMENU:=LUA
- TITLE:=Posix library for Lua
- URL:=http://luaforge.net/projects/luaposix/
- DEPENDS:=+liblua
-endef
-
-define Build/Configure
-endef
-
-MAKE_FLAGS += \
- OS=Linux
-
-define Package/luaposix/install
- $(INSTALL_DIR) $(1)/usr/lib/lua
- $(CP) $(PKG_BUILD_DIR)/posix.so $(1)/usr/lib/lua
-endef
-
-$(eval $(call BuildPackage,luaposix))
diff --git a/contrib/package/luaposix/patches/200-crypt.patch b/contrib/package/luaposix/patches/200-crypt.patch
deleted file mode 100644
index 6ceab5556..000000000
--- a/contrib/package/luaposix/patches/200-crypt.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/lposix.c
-+++ b/lposix.c
-@@ -1016,6 +1016,29 @@
- }
- #endif
-
-+/*
-+ * XXX: GNU and BSD handle the forward declaration of crypt() in different
-+ * and annoying ways (especially GNU). Declare it here just to make sure
-+ * that it's there
-+ */
-+char *crypt(const char *, const char *);
-+
-+static int Pcrypt(lua_State *L)
-+{
-+ const char *str, *salt;
-+ char *res;
-+
-+ str = luaL_checkstring(L, 1);
-+ salt = luaL_checkstring(L, 2);
-+ if (strlen(salt) < 2)
-+ luaL_error(L, "not enough salt");
-+
-+ res = crypt(str, salt);
-+ lua_pushstring(L, res);
-+
-+ return 1;
-+}
-+
- static const luaL_reg R[] =
- {
- {"access", Paccess},
-@@ -1023,6 +1046,7 @@
- {"chdir", Pchdir},
- {"chmod", Pchmod},
- {"chown", Pchown},
-+ {"crypt", Pcrypt},
- {"ctermid", Pctermid},
- {"dirname", Pdirname},
- {"dir", Pdir},
---- a/Makefile
-+++ b/Makefile
-@@ -37,8 +37,10 @@
- OS=$(shell uname)
- ifeq ($(OS),Darwin)
- LDFLAGS_SHARED=-bundle -undefined dynamic_lookup
-+ LIBS=
- else
- LDFLAGS_SHARED=-shared
-+ LIBS=-lcrypt
- endif
-
- # targets
-@@ -50,7 +52,7 @@
- $(LUA) test.lua
-
- $T: $(OBJS)
-- $(CC) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $(OBJS)
-+ $(CC) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $(OBJS) $(LIBS)
-
- $(OBJS): modemuncher.c
-
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 754f4391a..1f1a3e91e 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -100,7 +100,7 @@ endef
define Package/luci-core
$(call Package/luci/libtemplate)
- DEPENDS:=+lua +luaposix +bitlib
+ DEPENDS:=+lua
TITLE:=LuCI core libraries
endef