Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] lua51-mpack: fix cross
@ 2022-06-15 20:56 paper42
  2022-06-17 14:01 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2022-06-15 20:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages lua51-mpack-cross
https://github.com/void-linux/void-packages/pull/37577

lua51-mpack: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly** (only build-tested)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/37577.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua51-mpack-cross-37577.patch --]
[-- Type: text/x-diff, Size: 1983 bytes --]

From 8f47a94e810976af5d8d260c5c2fd6f7d5e15623 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Jun 2022 10:29:43 +0200
Subject: [PATCH] lua51-mpack: fix cross

---
 srcpkgs/lua51-mpack/patches/cross.patch | 11 +++++++++++
 srcpkgs/lua51-mpack/template            |  9 ++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/lua51-mpack/patches/cross.patch

diff --git a/srcpkgs/lua51-mpack/patches/cross.patch b/srcpkgs/lua51-mpack/patches/cross.patch
new file mode 100644
index 000000000000..638c0a7ac18b
--- /dev/null
+++ b/srcpkgs/lua51-mpack/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@
+ CFLAGS += -DLUA_C89_NUMBERS
+ endif
+ 
+-LUA_IMPL ?= lua-$(MPACK_LUA_VERSION_NOPATCH)
++LUA_IMPL ?= lua$(MPACK_LUA_VERSION_NOPATCH)
+ LUA_INCLUDE ?= $(shell $(PKG_CONFIG) --cflags $(LUA_IMPL) 2>/dev/null || echo "-I/usr/include/lua$(MPACK_LUA_VERSION_NOPATCH)")
+ INCLUDES = $(LUA_INCLUDE)
+ LIBS =
diff --git a/srcpkgs/lua51-mpack/template b/srcpkgs/lua51-mpack/template
index f87c6b51a250..d5192f89830c 100644
--- a/srcpkgs/lua51-mpack/template
+++ b/srcpkgs/lua51-mpack/template
@@ -3,7 +3,10 @@ pkgname=lua51-mpack
 version=1.0.7
 revision=1
 wrksrc="libmpack-lua-${version}"
-hostmakedepends="libtool"
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="USE_SYSTEM_MPACK=1 USE_SYSTEM_LUA=1"
+hostmakedepends="libtool pkg-config"
 makedepends="lua51-devel libmpack-devel"
 short_desc="Simple implementation of MessagePack for Lua 5.1"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
@@ -12,10 +15,6 @@ homepage="https://github.com/libmpack/libmpack-lua"
 distfiles="https://github.com/libmpack/libmpack-lua/archive/${version}.tar.gz"
 checksum=2ebe9c8972c378040c9b8505f5fb40a0c64d990cd68be6a62989362b18294d0a
 
-do_build() {
-	make ${makejobs} USE_SYSTEM_MPACK=1 USE_SYSTEM_LUA=1
-}
-
 do_install() {
 	vinstall mpack.so 755 usr/lib/lua/5.1
 	vlicense LICENSE-MIT

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: lua51-mpack: fix cross
  2022-06-15 20:56 [PR PATCH] lua51-mpack: fix cross paper42
@ 2022-06-17 14:01 ` paper42
  0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-06-17 14:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]

There's a merged pull request on the void-packages repository

lua51-mpack: fix cross
https://github.com/void-linux/void-packages/pull/37577

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly** (only build-tested)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-17 14:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15 20:56 [PR PATCH] lua51-mpack: fix cross paper42
2022-06-17 14:01 ` [PR PATCH] [Merged]: " paper42

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).