-
Notifications
You must be signed in to change notification settings - Fork 3.9k
prosody: update to 13.0.6 #30077
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
commodo
wants to merge
6
commits into
openwrt:master
Choose a base branch
from
commodo:prosody-13.0.6
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+302
−57
Open
prosody: update to 13.0.6 #30077
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
df57220
luafilesystem: add Lua 5.4 variant
commodo fe13628
luaexpat: add Lua 5.4 variant
commodo da4771c
luasocket: add Lua 5.4 variant
commodo 4395432
luasec: add Lua 5.4 variant
commodo 0793d7f
prosody: update to 13.0.6
commodo 4ada780
prosody: extend test.sh past the version string grep
commodo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk | |
|
|
||
| PKG_NAME:=luafilesystem | ||
| PKG_VERSION:=1.9.0 | ||
| PKG_RELEASE:=1 | ||
| PKG_RELEASE:=2 | ||
| PKG_LICENSE:=MIT | ||
|
|
||
| PKG_MIRROR_HASH:=a64d8299c7c875bd2183f82f9a71f6fcc7610ee7377add0b6069fea3d7355073 | ||
|
|
@@ -19,48 +19,81 @@ PKG_SOURCE_PROTO:=git | |
|
|
||
| include $(INCLUDE_DIR)/package.mk | ||
|
|
||
| define Package/luafilesystem | ||
| define Package/luafilesystem/default | ||
| SUBMENU:=Lua | ||
| SECTION:=lang | ||
| CATEGORY:=Languages | ||
| TITLE:=LuaFileSystem | ||
| URL:=https://lunarmodules.github.io/luafilesystem/ | ||
| MAINTAINER:=W. Michael Petullo <mike@flyn.org> | ||
| endef | ||
|
|
||
| define Package/luafilesystem | ||
| $(Package/luafilesystem/default) | ||
| DEPENDS:=+liblua | ||
| VARIANT:=lua-51 | ||
| DEFAULT_VARIANT:=1 | ||
| endef | ||
|
|
||
| define Package/luafilesystem5.4 | ||
| $(Package/luafilesystem/default) | ||
| TITLE+= (Lua 5.4) | ||
| DEPENDS:=+liblua5.4 | ||
| VARIANT:=lua-54 | ||
| endef | ||
|
|
||
| define Package/luafilesystem/description | ||
| define Package/luafilesystem/default/description | ||
| This package contains the LuaFileSystem library, a set of portable | ||
| functions for directory creation, listing and deletion and for file | ||
| locking. | ||
| endef | ||
| Package/luafilesystem/description = $(Package/luafilesystem/default/description) | ||
| Package/luafilesystem5.4/description = $(Package/luafilesystem/default/description) | ||
|
|
||
| ifeq ($(BUILD_VARIANT),lua-51) | ||
| LUA_VERSION:=5.1 | ||
| LUA_LIBNAME:=lua | ||
| LUA_INCDIR:=$(STAGING_DIR)/usr/include | ||
| LUA_INSTALL_DIR:=/usr/lib/lua | ||
| endif | ||
|
|
||
| ifeq ($(BUILD_VARIANT),lua-54) | ||
| LUA_VERSION:=5.4 | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: Generated by Claude Code |
||
| LUA_LIBNAME:=lua5.4 | ||
| LUA_INCDIR:=$(STAGING_DIR)/usr/include/lua5.4 | ||
| LUA_INSTALL_DIR:=/usr/lib/lua/5.4 | ||
| endif | ||
|
|
||
| define Build/Configure | ||
| endef | ||
|
|
||
| TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS) | ||
|
|
||
| TARGET_LDFLAGS += -llua | ||
| TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS) -I$(LUA_INCDIR) | ||
|
|
||
| define Build/Compile | ||
| $(MAKE) -C $(PKG_BUILD_DIR) \ | ||
| $(TARGET_CONFIGURE_OPTS) \ | ||
| CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ | ||
| LDFLAGS="$(TARGET_LDFLAGS)" | ||
| LDFLAGS="$(TARGET_LDFLAGS) -l$(LUA_LIBNAME)" | ||
| $(TARGET_CROSS)ar r $(PKG_BUILD_DIR)/src/luafilesystem.a $(PKG_BUILD_DIR)/src/lfs.o | ||
| endef | ||
|
|
||
| define Build/InstallDev | ||
| $(INSTALL_DIR) $(STAGING_DIR)/usr/include | ||
| $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/lua | ||
| $(INSTALL_DIR) $(STAGING_DIR)$(LUA_INSTALL_DIR) | ||
| $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/lfs.h $(STAGING_DIR)/usr/include | ||
| $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)/usr/lib/lua | ||
| $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)/usr/lib/lua | ||
| $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(STAGING_DIR)$(LUA_INSTALL_DIR) | ||
| $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/luafilesystem.a $(STAGING_DIR)$(LUA_INSTALL_DIR) | ||
| endef | ||
|
|
||
| define Package/luafilesystem/install | ||
| $(INSTALL_DIR) $(1)/usr/lib/lua | ||
| $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/lfs.so | ||
| endef | ||
|
|
||
| define Package/luafilesystem5.4/install | ||
| $(INSTALL_DIR) $(1)/usr/lib/lua/5.4 | ||
| $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lfs.so $(1)/usr/lib/lua/5.4/lfs.so | ||
| endef | ||
|
|
||
| $(eval $(call BuildPackage,luafilesystem)) | ||
| $(eval $(call BuildPackage,luafilesystem5.4)) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit:
LUA_INSTALL_DIRis set for both variants here but never referenced — thePackage/luaexpat*/installrecipes hardcode/usr/lib/luaand/usr/lib/lua/5.4. In the sibling luasec/luafilesystem Makefiles of this same series the identical variable drives the install path, so this reads as leftover dead code. Either use it in the install recipes or drop it.Generated by Claude Code