diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-11 02:48:31 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-11 02:48:31 +0000 |
| commit | 6a74025efdb7e8522390a7fe053f79200f384a85 (patch) | |
| tree | b3d5ad4ec6f33162cdf00cad5727e9d1283c525c | |
| parent | 3ced72e9c7df57380c48ddeb4b422757b1c21491 (diff) | |
lua changes:
- fix shared lib generation
- don't ship liblua.so dev lib in liblua package
- remove unsupported 'all' make target during build
- misc cleanup
- bump release number
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13179 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/lua/Makefile | 14 | ||||
| -rw-r--r-- | package/lua/patches/020-shared_liblua.patch | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/package/lua/Makefile b/package/lua/Makefile index 4523ff14b4..aff52c3f24 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lua PKG_VERSION:=5.1.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ @@ -19,9 +19,6 @@ PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ http://www.tecgraf.puc-rio.br/lua/ftp/ PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(INCLUDE_DIR)/package.mk define Package/lua/Default @@ -92,14 +89,13 @@ TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CROSS)gcc" \ - LD="$(TARGET_CROSS)ld" \ AR="$(TARGET_CROSS)ar rcu" \ RANLIB="$(TARGET_CROSS)ranlib" \ INSTALL_ROOT=/usr \ CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ MYLDFLAGS="$(TARGET_LDFLAGS)" \ PKG_VERSION=$(PKG_VERSION) \ - all linux + linux rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -113,13 +109,13 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/lnum_config.h $(1)/usr/include/ mkdir -p $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.{a,so*} $(1)/usr/lib/ ln -sf liblua.so.$(PKG_VERSION) $(1)/usr/lib/liblualib.so endef define Package/liblua/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua.so.* $(1)/usr/lib/ endef define Package/lua/install diff --git a/package/lua/patches/020-shared_liblua.patch b/package/lua/patches/020-shared_liblua.patch index d948841b8a..cb7940f7ee 100644 --- a/package/lua/patches/020-shared_liblua.patch +++ b/package/lua/patches/020-shared_liblua.patch @@ -129,7 +129,7 @@ Index: lua-5.1.4/src/Makefile -$(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) +$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@.$(PKG_VERSION) -shared -soname="$@.$(PKG_VERSION)" $? -nostdlib -lgcc ++ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? + ln -fs $@.$(PKG_VERSION) $@ + +$(LUA_T): $(LUA_O) $(LUA_SO) |