diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-07-09 10:38:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-09 10:38:38 -0700 |
| commit | 1fd46bfacc21b942b88cd5f0612bebec5b2db810 (patch) | |
| tree | 288e931ff52459c6b326129caa6954a6d4f65d30 /lang | |
| parent | 3d757938404bc12c45587b131875faab9fd0da03 (diff) | |
| parent | 6e3ba49a043c46bc39c28116796b345c256cc755 (diff) | |
Merge pull request #9393 from neheb/ld
ldbus: Update to latest version
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ldbus/Makefile | 22 | ||||
| -rw-r--r-- | lang/luarocks/Makefile | 2 | ||||
| -rw-r--r-- | lang/luarocks/patches/01_dont_modify_bin_shebang.diff | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/lang/ldbus/Makefile b/lang/ldbus/Makefile index a0500a64f..091cb0558 100644 --- a/lang/ldbus/Makefile +++ b/lang/ldbus/Makefile @@ -7,15 +7,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ldbus -PKG_RELEASE:=2 -PKG_MIRROR_HASH:=0e39a80e126a77a937226e49ae0246e1fd4600a03dee6bdee5ac822963a234e1 +PKG_SOURCE_DATE:=2019-03-25 +PKG_SOURCE_VERSION:=345d820b0f34bd35ea01dae633d35ea3cf7faf2a +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=f4a1464e915a2313c80fb40c5c40b0bee7583677 -PKG_SOURCE_DATE:=2017-10-03 PKG_SOURCE_URL=https://github.com/daurnimator/ldbus +PKG_MIRROR_HASH:=c0f5d1b34bc8b82d0f70bad23ecaca10ef84730c2c3ea318673b5a941f4dfc85 + PKG_MAINTAINER:=Enrico Mioso <mrkiko.rs@gmail.com> PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=luarocks/host @@ -44,18 +46,20 @@ MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" -define Package/ldbus/install - $(INSTALL_DIR) $(1)/usr/lib/lua - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ldbus.so $(1)/usr/lib/lua -endef - define Build/Compile cd $(PKG_BUILD_DIR) && \ luarocks make --pack-binary-rock ldbus-scm-0.rockspec \ + LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \ + LUA_PKGNAME=lua5.1 \ DBUS_INCDIR=$(STAGING_DIR)/usr/include/dbus-1.0/ \ DBUS_ARCH_INCDIR=$(STAGING_DIR)/usr/lib/dbus-1.0/include \ DBUS_LIBDIR=$(STAGING_DIR)/usr/lib \ CC="$(TARGET_CC)" LD="$(TARGET_CC)" endef +define Package/ldbus/install + $(INSTALL_DIR) $(1)/usr/lib/lua + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ldbus.so $(1)/usr/lib/lua +endef + $(eval $(call BuildPackage,ldbus)) diff --git a/lang/luarocks/Makefile b/lang/luarocks/Makefile index 3428ef838..683bb9e55 100644 --- a/lang/luarocks/Makefile +++ b/lang/luarocks/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luarocks PKG_VERSION:=2.2.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_MIRROR_HASH:=e4cf874c9bce34a5accd41daaf51a3213763b8b6f7f658ca4d13a70a7ddb1c0c diff --git a/lang/luarocks/patches/01_dont_modify_bin_shebang.diff b/lang/luarocks/patches/01_dont_modify_bin_shebang.diff index a1bad2151..69ab5c593 100644 --- a/lang/luarocks/patches/01_dont_modify_bin_shebang.diff +++ b/lang/luarocks/patches/01_dont_modify_bin_shebang.diff @@ -6,7 +6,7 @@ diff -rupN luarocks/Makefile luarocks.new/Makefile do \ sed "1d" src/bin/$$f > src/bin/$$f.bak ;\ - echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\ -+ echo "#!/usr/bin/env lua" > src/bin/$$f ;\ ++ echo "#!/usr/bin/env lua5.1" > src/bin/$$f ;\ echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\ cat src/bin/$$f.bak >> src/bin/$$f ;\ chmod +x src/bin/$$f ;\ |