mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-lua/lanes: bump to version 3.13.0
Closes: https://bugs.gentoo.org/716710 Closes: https://bugs.gentoo.org/727076 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Conrad Kostecki
@@ -1 +1,2 @@
|
||||
DIST lanes-3.10.0.tar.gz 231359 BLAKE2B beb1972a9b37097947fc673a644330fe8b66c826bc09967526b96d8e28838939516ee3ad4640fb8e5dca7061227c2844d55270c48f26416c7a7bd3613a83e648 SHA512 4a49f560623e291a8344ffef69f4f26fd422d21d3926d73dfee9c9ae9ebd4973e5ae2d307dfd42c5a3bf101bfcc277df54f0a46d89390c83483208e36d4e5d9b
|
||||
DIST lanes-3.13.0.tar.gz 247978 BLAKE2B e330f3648e865b8b7c1b77061b6a8210f46e1db650066736afe62040dbb20c7e31e0037b420fded8fb0931cc2ac59687e2039fb31f43c1bdf0cae8cd3c031307 SHA512 bb509181757fa2b4f07a55962015b35ca6bb867b18ec89dd655f333babe2e12f56479fa85bc98e0dacf5bec2a523265bbc3a978396dc332dc1fdda4df760b2e5
|
||||
|
||||
93
dev-lua/lanes/files/lanes-3.13.0-makefile.patch
Normal file
93
dev-lua/lanes/files/lanes-3.13.0-makefile.patch
Normal file
@@ -0,0 +1,93 @@
|
||||
--- lanes-3.13.0.old/Makefile 2018-11-30 13:28:50.000000000 +0100
|
||||
+++ lanes-3.13.0/Makefile 2020-11-30 21:28:36.769384766 +0100
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
# Autodetect LUA
|
||||
#
|
||||
-LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT))
|
||||
+LUA ?= $(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) lua$(_LUAEXT))
|
||||
|
||||
_TARGET_SO=$(_TARGET_DIR)/core.$(_SO)
|
||||
|
||||
--- lanes-3.13.0.old/src/Makefile 2018-11-30 13:28:50.000000000 +0100
|
||||
+++ lanes-3.13.0/src/Makefile 2020-11-30 21:40:06.399382894 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
#
|
||||
LIBFLAG=-shared
|
||||
|
||||
-OPT_FLAGS=-O2
|
||||
+OPT_FLAGS ?=
|
||||
# -O0 -g
|
||||
|
||||
_SO=so
|
||||
@@ -38,50 +38,8 @@
|
||||
LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
|
||||
LIBFLAG=-shared -Wl,-Map,lanes.map
|
||||
else
|
||||
- # Autodetect LUA_FLAGS and/or LUA_LIBS
|
||||
- #
|
||||
- ifneq "$(shell which pkg-config)" ""
|
||||
- ifeq "$(shell pkg-config --exists luajit && echo 1)" "1"
|
||||
- LUA_FLAGS:=$(shell pkg-config --cflags luajit)
|
||||
- LUA_LIBS:=$(shell pkg-config --libs luajit)
|
||||
- #
|
||||
- # Debian: -I/usr/include/luajit-2.0
|
||||
- # -lluajit-5.1
|
||||
- else
|
||||
- ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1"
|
||||
- LUA_FLAGS:=$(shell pkg-config --cflags lua5.1)
|
||||
- LUA_LIBS:=$(shell pkg-config --libs lua5.1)
|
||||
- #
|
||||
- # Ubuntu: -I/usr/include/lua5.1
|
||||
- # -llua5.1
|
||||
- else
|
||||
- ifeq "$(shell pkg-config --exists lua && echo 1)" "1"
|
||||
- LUA_FLAGS:=$(shell pkg-config --cflags lua)
|
||||
- LUA_LIBS:=$(shell pkg-config --libs lua)
|
||||
- #
|
||||
- # OS X fink with pkg-config:
|
||||
- # -I/sw/include
|
||||
- # -L/sw/lib -llua -lm
|
||||
- else
|
||||
- $(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' - Good luck!)
|
||||
- LUA_FLAGS:=
|
||||
- LUA_LIBS:=-llua
|
||||
- endif
|
||||
- endif
|
||||
- endif
|
||||
- else
|
||||
- # No 'pkg-config'; try defaults
|
||||
- #
|
||||
- ifeq "$(shell uname -s)" "Darwin"
|
||||
- $(warning *** Assuming 'fink' at default path)
|
||||
- LUA_FLAGS:=-I/sw/include
|
||||
- LUA_LIBS:=-L/sw/lib -llua
|
||||
- else
|
||||
- $(warning *** Assuming an arbitrary Lua installation; try installing 'pkg-config')
|
||||
- LUA_FLAGS:=
|
||||
- LUA_LIBS:=-llua
|
||||
- endif
|
||||
- endif
|
||||
+ LUA_FLAGS ?= $(shell pkg-config --cflags lua)
|
||||
+ LUA_LIBS ?= $(shell pkg-config --libs lua)
|
||||
endif
|
||||
|
||||
ifeq "$(shell uname -s)" "Darwin"
|
||||
@@ -92,7 +50,7 @@
|
||||
LIBFLAG = -bundle -undefined dynamic_lookup
|
||||
endif
|
||||
|
||||
- CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
|
||||
+ CFLAGS=-Wall $(OPT_FLAGS) $(LUA_FLAGS)
|
||||
LIBS=$(LUA_LIBS)
|
||||
endif
|
||||
|
||||
@@ -125,7 +83,7 @@
|
||||
#
|
||||
$(MODULE_DIR)/core.$(_SO): $(OBJ)
|
||||
mkdir -p $(MODULE_DIR)
|
||||
- $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
|
||||
+ $(CC) $(LDFLAGS) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
|
||||
|
||||
clean:
|
||||
-rm -rf $(MODULE)/core.$(_SO) *.o *.map
|
||||
59
dev-lua/lanes/lanes-3.13.0.ebuild
Normal file
59
dev-lua/lanes/lanes-3.13.0.ebuild
Normal file
@@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Lightweight, native, lazy evaluating multithreading library"
|
||||
HOMEPAGE="https://github.com/LuaLanes/lanes"
|
||||
SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
IUSE="luajit test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? ( dev-lang/lua:0 )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
test? ( ${RDEPEND} )
|
||||
"
|
||||
|
||||
HTML_DOCS=( "docs/." )
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" )
|
||||
|
||||
src_compile() {
|
||||
local myemakeargs=(
|
||||
"CC=$(tc-getCC)"
|
||||
"LUA=$(usex luajit 'luajit' 'lua')"
|
||||
"LUA_FLAGS=-I$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
|
||||
"LUA_LIBS="
|
||||
"OPT_FLAGS=${CFLAGS}"
|
||||
)
|
||||
|
||||
emake "${myemakeargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake LUA=$(usex luajit 'luajit' 'lua') test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myemakeargs=(
|
||||
"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
|
||||
"LUA_SHAREDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
|
||||
)
|
||||
|
||||
emake "${myemakeargs[@]}" install
|
||||
|
||||
einstalldocs
|
||||
}
|
||||
Reference in New Issue
Block a user