From 53bb3d643735ee04164e6896ccd616b79865cd05 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 2 Feb 2018 01:01:24 +0100 Subject: [PATCH] dev-util/bam: bump to 0.5.1 --- ...am-0.5.0.exheres-0 => bam-0.5.1.exheres-0} | 8 ++--- ...8f0956a78844e73aa94fee7d0187c9b68bbd.patch | 31 ------------------- ...icking-up-toolchain-from-environment.patch | 31 ------------------- 3 files changed, 2 insertions(+), 68 deletions(-) rename packages/dev-util/bam/{bam-0.5.0.exheres-0 => bam-0.5.1.exheres-0} (82%) delete mode 100644 packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch delete 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.1.exheres-0 similarity index 82% rename from packages/dev-util/bam/bam-0.5.0.exheres-0 rename to packages/dev-util/bam/bam-0.5.1.exheres-0 index 14f371d..51fa6f8 100644 --- a/packages/dev-util/bam/bam-0.5.0.exheres-0 +++ b/packages/dev-util/bam/bam-0.5.1.exheres-0 @@ -12,18 +12,14 @@ PLATFORMS="~amd64 ~x86" MYOPTIONS="" DEPENDENCIES=" + build: + virtual/pkg-config 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" ) diff --git a/packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch b/packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch deleted file mode 100644 index 89d21a9..0000000 --- a/packages/dev-util/bam/files/27b28f0956a78844e73aa94fee7d0187c9b68bbd.patch +++ /dev/null @@ -1,31 +0,0 @@ -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-picking-up-toolchain-from-environment.patch b/packages/dev-util/bam/files/bam-0.5.0-Fix-picking-up-toolchain-from-environment.patch deleted file mode 100644 index d9b4dc5..0000000 --- a/packages/dev-util/bam/files/bam-0.5.0-Fix-picking-up-toolchain-from-environment.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 -