From 77036b4c0092ccba6a529c66ff49ebeef2df45ba Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 1 Oct 2016 15:01:42 +0200 Subject: [PATCH] dev-util/bam: bump to 0.5.0 --- packages/dev-util/bam/bam-0.5.0.exheres-0 | 47 +++++++++++++++++++ ...8f0956a78844e73aa94fee7d0187c9b68bbd.patch | 31 ++++++++++++ .../files/bam-0.5.0-Fix-parallel-build.patch | 46 ++++++++++++++++++ ...icking-up-toolchain-from-environment.patch | 31 ++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 packages/dev-util/bam/bam-0.5.0.exheres-0 create mode 100644 packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch create mode 100644 packages/dev-util/bam/files/bam-0.5.0-Fix-parallel-build.patch create mode 100644 packages/dev-util/bam/files/bam-0.5.0-Fix-picking-up-toolchain-from-environment.patch diff --git a/packages/dev-util/bam/bam-0.5.0.exheres-0 b/packages/dev-util/bam/bam-0.5.0.exheres-0 new file mode 100644 index 00000000..14f371d3 --- /dev/null +++ b/packages/dev-util/bam/bam-0.5.0.exheres-0 @@ -0,0 +1,47 @@ +# Copyright 2016 Julian Ospald +# Distributed under the terms of the GNU General Public License v2 + +require lua [ multibuild=false whitelist="5.2 5.3" ] +require github [ user=matricks tag="v${PV}" ] + +SUMMARY="Fast and flexible Lua-based build system" + +LICENCES="ZLIB" +SLOT="0" +PLATFORMS="~amd64 ~x86" +MYOPTIONS="" + +DEPENDENCIES=" + test: + dev-lang/python:2.7 +" + +BUGS_TO="hasufell@posteo.de" + +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/${PNV}-Fix-parallel-build.patch + "${FILES}"/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch + "${FILES}"/${PNV}-Fix-picking-up-toolchain-from-environment.patch +) + +DEFAULT_SRC_INSTALL_PARAMS=( + INSTALL_BINDIR="/usr/$(exhost --target)/bin" +) + +src_compile() { + emake \ + LUA_LIBS="$(${PKG_CONFIG} --libs lua-$(lua_get_abi))" \ + LUA_CFLAGS="$(${PKG_CONFIG} --cflags lua-$(lua_get_abi))" +} + +src_test() { + # https://github.com/matricks/bam/issues/102 + export CC=$(exhost --build)-gcc CXX=$(exhost --build)-g++ + + emake -j1 \ + LUA_LIBS="$(${PKG_CONFIG} --libs lua-$(lua_get_abi))" \ + LUA_CFLAGS="$(${PKG_CONFIG} --cflags lua-$(lua_get_abi))" \ + PYTHON="python2.7" \ + test +} + diff --git a/packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch b/packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch new file mode 100644 index 00000000..89d21a9d --- /dev/null +++ b/packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch @@ -0,0 +1,31 @@ +From 27b28f0956a78844e73aa94fee7d0187c9b68bbd Mon Sep 17 00:00:00 2001 +From: Magnus Auvinen +Date: Sun, 19 Jun 2016 15:58:22 +0200 +Subject: [PATCH] fixed issues with CC environment variables + +--- + src/tools.lua | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/tools.lua b/src/tools.lua +index f3b9b10..ce7cfeb 100644 +--- a/src/tools.lua ++++ b/src/tools.lua +@@ -5,14 +5,11 @@ function SetDefaultDrivers(settings) + if _checked_default_drivers == false then + _checked_default_drivers = true + if os.getenv("CC") then +- if string.match(os.getenv("CC"), "^clang") then +- print("CLANG!") ++ if string.match(os.getenv("CC"), ".*clang.*") then + SetDriversDefault = SetDriversClang +- elseif string.match(os.getenv("CC"), "^gcc") then +- print("GCC!") ++ elseif string.match(os.getenv("CC"), ".*gcc.*") then + SetDriversDefault = SetDriversGCC +- elseif string.match(os.getenv("CC"), "^clang") then +- print("CL!") ++ elseif string.match(os.getenv("CC"), ".*cl.*") then + SetDriversDefault = SetDriversCL + end + else diff --git a/packages/dev-util/bam/files/bam-0.5.0-Fix-parallel-build.patch b/packages/dev-util/bam/files/bam-0.5.0-Fix-parallel-build.patch new file mode 100644 index 00000000..070c5d96 --- /dev/null +++ b/packages/dev-util/bam/files/bam-0.5.0-Fix-parallel-build.patch @@ -0,0 +1,46 @@ +From cf972fb6eacd32a2d92660ce072b4fa332bdbea0 Mon Sep 17 00:00:00 2001 +From: Julian Ospald +Date: Sat, 1 Oct 2016 13:50:26 +0200 +Subject: [PATCH] Fix parallel build +Upstream: submitted, https://github.com/matricks/bam/pull/101 + +--- + Makefile | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index 8ff4b72..d804874 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,7 @@ CFLAGS += $(LUA_CFLAGS) + + + # objects +-TARGETS = txt2c internal_base bam ++TARGETS = bam + BAM_OBJ = $(patsubst %.c,%.o,$(wildcard src/*.c)) + TXT2C_LUA = $(wildcard src/*.lua) + +@@ -24,14 +24,14 @@ TXT2C_LUA = $(wildcard src/*.lua) + # make rules + all: $(TARGETS) + +-txt2c: src/tools/txt2c ++src/tools/txt2c: src/tools/txt2c.c + +-internal_base: src/internal_base.h +- +-src/internal_base.h: ++src/internal_base.h: src/tools/txt2c + src/tools/txt2c $(TXT2C_LUA) > src/internal_base.h + +-bam: txt2c internal_base $(BAM_OBJ) ++src/main.o: src/internal_base.h src/main.c ++ ++bam: $(BAM_OBJ) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BAM_OBJ) $(LIBS) + + test: $(TARGETS) +-- +2.10.0 + diff --git a/packages/dev-util/bam/files/bam-0.5.0-Fix-picking-up-toolchain-from-environment.patch b/packages/dev-util/bam/files/bam-0.5.0-Fix-picking-up-toolchain-from-environment.patch new file mode 100644 index 00000000..d9b4dc5e --- /dev/null +++ b/packages/dev-util/bam/files/bam-0.5.0-Fix-picking-up-toolchain-from-environment.patch @@ -0,0 +1,31 @@ +From 7901d9086cace08659ea7e8bde52e4c464542958 Mon Sep 17 00:00:00 2001 +From: Julian Ospald +Date: Sat, 1 Oct 2016 14:53:46 +0200 +Subject: [PATCH] Fix picking up toolchain from environment +Upstream: submitted, https://github.com/matricks/bam/pull/103 + +* respect AR as well +* set settings.ddl.exe to CXX +--- + src/tools.lua | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/tools.lua b/src/tools.lua +index ce7cfeb..c62a80e 100644 +--- a/src/tools.lua ++++ b/src/tools.lua +@@ -36,6 +36,11 @@ function SetDefaultDrivers(settings) + if os.getenv("CXX") then + settings.cc.exe_cxx = os.getenv("CXX") + settings.link.exe = os.getenv("CXX") ++ settings.dll.exe = os.getenv("CXX") ++ end ++ ++ if os.getenv("AR") then ++ settings.lib.exe = os.getenv("AR") + end + + if os.getenv("CFLAGS") then +-- +2.10.0 +