pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lua-mpack: Update to 1.0.8
Module Name: pkgsrc-wip
Committed By: Jonathan Buschmann <jonthn+pkgsrc%pinacea.com@localhost>
Pushed By: jonthn
Date: Wed Jan 1 22:12:56 2020 +0800
Changeset: 46870c3f77d773adaec8b0e9cc079d68358547a3
Modified Files:
lua-mpack/DESCR
lua-mpack/Makefile
lua-mpack/distinfo
Added Files:
lua-mpack/patches/patch-Makefile
Log Message:
lua-mpack: Update to 1.0.8
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=46870c3f77d773adaec8b0e9cc079d68358547a3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lua-mpack/DESCR | 3 +--
lua-mpack/Makefile | 35 ++++++++++++++++++-----------------
lua-mpack/distinfo | 9 +++++----
lua-mpack/patches/patch-Makefile | 39 +++++++++++++++++++++++++++++++++++++++
4 files changed, 63 insertions(+), 23 deletions(-)
diffs:
diff --git a/lua-mpack/DESCR b/lua-mpack/DESCR
index b3949e7933..4ba4577583 100644
--- a/lua-mpack/DESCR
+++ b/lua-mpack/DESCR
@@ -1,2 +1 @@
-libmpack is a small binary serialization/RPC library that implements both
-the msgpack and msgpack-rpc specifications.
+libmpack lua binding
diff --git a/lua-mpack/Makefile b/lua-mpack/Makefile
index 208159305b..27dd3d9672 100644
--- a/lua-mpack/Makefile
+++ b/lua-mpack/Makefile
@@ -1,33 +1,34 @@
# $NetBSD$
-DISTNAME= libmpack-1.0.3
-PKGNAME= ${DISTNAME:S/libmpack/${LUA_PKGPREFIX}-mpack/}
+DISTNAME= libmpack-lua-1.0.8
+PKGNAME= ${DISTNAME:S/libmpack-lua/${LUA_PKGPREFIX}-mpack/}
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=tarruda/}
-GITHUB_PROJECT= libmpack
+MASTER_SITES= ${MASTER_SITE_GITHUB:=libmpack/}
+GITHUB_PROJECT= libmpack-lua
-HOMEPAGE= https://github.com/tarruda/libmpack
-COMMENT= Simple implementation of msgpack in C
+HOMEPAGE= https://github.com/libmpack/libmpack-lua
+COMMENT= Lua binding for libmpack
LICENSE= mit
USE_LANGUAGES= c
-LUA_VERSIONS_ACCEPTED= 51
-
INSTALLATION_DIRS+= ${LUA_CDIR}
+USE_TOOLS+= gmake pkg-config
+
+
+MAKE_ENV+= DEPS_PREFIX=${PREFIX}
+MAKE_ENV+= USE_SYSTEM_LUA=yes
+MAKE_ENV+= USE_SYSTEM_MPACK=yes
+MAKE_ENV+= MPACK_LUA_VERSION=${_LUA_DOT_VERSION}.0
.include "../../mk/bsd.prefs.mk"
-do-build:
- cd ${WRKSRC}/binding/lua/ && ${CC} -O2 -fPIC -I${PREFIX}/${LUA_INCDIR} -c lmpack.c -o lmpack.o
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
- cd ${WRKSRC}/binding/lua/ && ${CC} -bundle -undefined dynamic_lookup -all_load lmpack.o -o mpack.so
-.else
- cd ${WRKSRC}/binding/lua/ && ${CC} -shared -fPIC lmpack.o -o mpack.so
+.if ${OPSYS} == "Darwin"
+BUILD_MAKE_FLAGS+= LDFLAGS="-undefined dynamic_lookup"
+BUILD_MAKE_FLAGS+= LUA_CDIR=${LUA_CDIR}
.endif
-do-install:
- ${INSTALL_LIB} ${WRKSRC}/binding/lua/mpack.so ${DESTDIR}${PREFIX}/${LUA_CDIR}
-
+.include "../../lang/lua/luaversion.mk"
.include "../../lang/lua/module.mk"
+.include "../../wip/libmpack/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lua-mpack/distinfo b/lua-mpack/distinfo
index 8f9e4e4ecd..2c33974001 100644
--- a/lua-mpack/distinfo
+++ b/lua-mpack/distinfo
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.3 2015/08/10 22:13:59 jonthn Exp $
-SHA1 (libmpack-1.0.3.tar.gz) = f4f2641c7590f3fb9038e630dad474bae0565c79
-RMD160 (libmpack-1.0.3.tar.gz) = 42a30eb44e49b552654f30b66f3def5c526c3019
-SHA512 (libmpack-1.0.3.tar.gz) = 3024d2830d83a7572a648ee6074467e2096dc6af7c92aaf3c6531e4c25c1c57d9853a60f5b2d1f50039ceeb80bae83f8fdc7241fa48f789cb636bba32fc2a9ba
-Size (libmpack-1.0.3.tar.gz) = 45720 bytes
+SHA1 (libmpack-lua-1.0.8.tar.gz) = 77060046d15cf40c59f8fd8aa2ef0978e925da11
+RMD160 (libmpack-lua-1.0.8.tar.gz) = 981b8129aeb608f6c9f805f2c269fa946150cb24
+SHA512 (libmpack-lua-1.0.8.tar.gz) = 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
+Size (libmpack-lua-1.0.8.tar.gz) = 15616 bytes
+SHA1 (patch-Makefile) = f2d984012c7d3d04378f6f86777eb6d4d5683358
diff --git a/lua-mpack/patches/patch-Makefile b/lua-mpack/patches/patch-Makefile
new file mode 100644
index 0000000000..9941d02af3
--- /dev/null
+++ b/lua-mpack/patches/patch-Makefile
@@ -0,0 +1,39 @@
+$NetBSD$
+
+--- Makefile.orig 2019-06-24 22:59:38.000000000 +0000
++++ Makefile
+@@ -51,7 +51,11 @@ endif
+ 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)
++ifeq ($(shell uname -s 2>/dev/null), Darwin)
++LIBS = -install_name $(PREFIX)/$(LUA_CDIR)/$(notdir $@) -undefined dynamic_lookup
++else
+ LIBS =
++endif
+
+ ifeq ($(USE_SYSTEM_MPACK),no)
+ MPACK_SRC = mpack-src
+@@ -112,8 +116,11 @@ gdb: $(BUSTED) $(MPACK)
+ $(DEPS_CMOD)/mpack.so: $(LUAROCKS) $(MPACK_SRC) lmpack.c
+ $(LUAROCKS) make CFLAGS='$(CFLAGS)' $(LUAROCKS_LDFLAGS)
+
+-mpack.so: lmpack.c $(MPACK_SRC)
+- $(CC) -shared $(CFLAGS) $(INCLUDES) $(LDFLAGS) $< -o $@ $(LIBS)
++mpack.o: lmpack.c $(MPACK_SRC)
++ $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
++
++mpack.so: lmpack.o $(MPACK_SRC)
++ $(CC) -shared $(LIBS) $(LDFLAGS) $< -o $@
+
+ $(BUSTED): $(LUAROCKS)
+ $(LUAROCKS) install penlight 1.3.2-2
+@@ -147,7 +154,7 @@ ifeq ($(USE_SYSTEM_LUA),no)
+ @:
+ else
+ mkdir -p "$(DESTDIR)$(LUA_CMOD_INSTALLDIR)"
+- install -Dm755 $< "$(DESTDIR)$(LUA_CMOD_INSTALLDIR)/$<"
++ install -m755 $< "$(DESTDIR)$(LUA_CMOD_INSTALLDIR)/$<"
+ endif
+
+ .PHONY: all clean depsclean install test gdb valgrind ci-test release
Home |
Main Index |
Thread Index |
Old Index