From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] lua54-lualdap: fix build for lua 5.4
Date: Sat, 29 Oct 2022 13:54:14 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40217@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages lua54-lualdap-fix-build
https://github.com/void-linux/void-packages/pull/40217
lua54-lualdap: fix build for lua 5.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
@jprjr
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40217.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua54-lualdap-fix-build-40217.patch --]
[-- Type: text/x-diff, Size: 1806 bytes --]
From 7fefa11a1489ebb7b8d9f98454a2ea144d8a85f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 29 Oct 2022 18:51:33 +0700
Subject: [PATCH] lua54-lualdap: fix build for lua 5.4
---
srcpkgs/lua54-lualdap/patches/lua54.patch | 4 ++--
srcpkgs/lua54-lualdap/template | 15 +++++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/lua54-lualdap/patches/lua54.patch b/srcpkgs/lua54-lualdap/patches/lua54.patch
index 134ac849931c..0cfd0d6bbdb6 100644
--- a/srcpkgs/lua54-lualdap/patches/lua54.patch
+++ b/srcpkgs/lua54-lualdap/patches/lua54.patch
@@ -1,5 +1,5 @@
---- a/src/compat-5.3.h
-+++ b/src/compat-5.3.h
+--- a/lua54/src/compat-5.3.h
++++ b/lua54/src/compat-5.3.h
@@ -399,11 +399,11 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname,
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 386222ce0c6d..30e4c95496ce 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -2,7 +2,7 @@
pkgname=lua54-lualdap
version=1.2.5
revision=3
-wrksrc="lualdap-${version}"
+create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="lua51-devel lua52-devel lua53-devel lua54-devel libldap-devel"
@@ -14,13 +14,12 @@ homepage="https://github.com/lualdap/lualdap"
distfiles="https://github.com/lualdap/lualdap/archive/v${version}.tar.gz"
checksum=3e028faa6a5798cf2f3d50b9853b9b3fb6eb562b62010747bd5b6f50b57bb1cc
-post_patch() {
- cd ${wrksrc}
- mkdir -p lua51
- mv * lua51 || true
- cp -a lua51 lua52
- cp -a lua51 lua53
- cp -a lua51 lua54
+post_extract() {
+ mv lualdap-${version} lua
+ cp -a lua lua51
+ cp -a lua lua52
+ cp -a lua lua53
+ cp -a lua lua54
}
do_build() {
next reply other threads:[~2022-10-29 11:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-29 11:54 sgn [this message]
2022-10-29 15:40 ` [PR PATCH] [Updated] " sgn
2022-10-31 2:30 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40217@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).