forked from hasufell/hasufell-repository
		
	dev-util/bam: bump to 0.5.1
This commit is contained in:
		
							parent
							
								
									e94b011147
								
							
						
					
					
						commit
						53bb3d6437
					
				| @ -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" | ||||
| ) | ||||
| @ -1,31 +0,0 @@ | ||||
| From 27b28f0956a78844e73aa94fee7d0187c9b68bbd Mon Sep 17 00:00:00 2001 | ||||
| From: Magnus Auvinen <git@matricks.se> | ||||
| 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 | ||||
| @ -1,31 +0,0 @@ | ||||
| From 7901d9086cace08659ea7e8bde52e4c464542958 Mon Sep 17 00:00:00 2001 | ||||
| From: Julian Ospald <hasufell@posteo.de> | ||||
| 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 | ||||
| 
 | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user