diff options
| author | joerg <joerg> | 2014-02-18 15:01:09 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-02-18 15:01:09 +0000 |
| commit | b37ce7c681b2c7747429169faa05058f259f1d86 (patch) | |
| tree | fdccf0b0c1ce8d370d78d6298530fa519dc23097 /cross | |
| parent | bc1628ef3daa7731dcf23de60df2af54427ac08d (diff) | |
| download | pkgsrc-b37ce7c681b2c7747429169faa05058f259f1d86.tar.gz | |
Honour our CXXFLAGS. Fix build with Clang.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/bossa/Makefile | 7 | ||||
| -rw-r--r-- | cross/bossa/distinfo | 4 | ||||
| -rw-r--r-- | cross/bossa/patches/patch-Makefile-NetBSD | 15 |
3 files changed, 21 insertions, 5 deletions
diff --git a/cross/bossa/Makefile b/cross/bossa/Makefile index 64eb1a1f10b..c23a52bb26e 100644 --- a/cross/bossa/Makefile +++ b/cross/bossa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/02/10 20:18:04 reinoud Exp $ +# $NetBSD: Makefile,v 1.4 2014/02/18 15:01:09 joerg Exp $ PKGNAME= bossa-20140109 DISTNAME= b-o-s-s-a-code-05bfcc39bc0453c3028b1161175b95a81af7a901 @@ -22,6 +22,11 @@ do-install: USE_LANGUAGES= c++ USE_TOOLS= gmake +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -Wno-error=tautological-compare +.endif + .include "../../devel/readline/buildlink3.mk" .include "../../x11/wxGTK28/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cross/bossa/distinfo b/cross/bossa/distinfo index 058240431f0..2d0cf4bc778 100644 --- a/cross/bossa/distinfo +++ b/cross/bossa/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2014/02/10 20:18:04 reinoud Exp $ +$NetBSD: distinfo,v 1.3 2014/02/18 15:01:09 joerg Exp $ SHA1 (b-o-s-s-a-code-05bfcc39bc0453c3028b1161175b95a81af7a901.zip) = 4a21cb6c19ad755fd31f6f0b96b6b1dd997c62c9 RMD160 (b-o-s-s-a-code-05bfcc39bc0453c3028b1161175b95a81af7a901.zip) = eb9cc01f00bf9c8f1d59ea11e0b8cede532e4829 Size (b-o-s-s-a-code-05bfcc39bc0453c3028b1161175b95a81af7a901.zip) = 692158 bytes -SHA1 (patch-Makefile-NetBSD) = b2ae0fa1a0377ffee8d44bf5c915c9771e5ee84f +SHA1 (patch-Makefile-NetBSD) = f3a145cadd6a889295b6f589c07c14d0468b7c98 SHA1 (patch-PortFactory.h) = 4faae14f2efe2fc20eac90910b458484060ee2da diff --git a/cross/bossa/patches/patch-Makefile-NetBSD b/cross/bossa/patches/patch-Makefile-NetBSD index e14a6c017b3..44034f0079b 100644 --- a/cross/bossa/patches/patch-Makefile-NetBSD +++ b/cross/bossa/patches/patch-Makefile-NetBSD @@ -1,6 +1,6 @@ -$NetBSD: patch-Makefile-NetBSD,v 1.2 2014/02/10 20:18:04 reinoud Exp $ +$NetBSD: patch-Makefile-NetBSD,v 1.3 2014/02/18 15:01:09 joerg Exp $ ---- Makefile.orig 2014-02-10 20:08:47.000000000 +0000 +--- Makefile.orig 2012-04-08 15:55:52.000000000 +0000 +++ Makefile @@ -75,6 +75,20 @@ install: strip endif @@ -23,3 +23,14 @@ $NetBSD: patch-Makefile-NetBSD,v 1.2 2014/02/10 20:18:04 reinoud Exp $ # OS X rules # ifeq ($(OS),Darwin) +@@ -142,8 +156,8 @@ ARMOBJCOPY=$(ARM)objcopy + # + # CXX Flags + # +-COMMON_CXXFLAGS+=-Wall -Werror -MT $@ -MD -MP -MF $(@:%.o=%.d) -DVERSION=\"$(VERSION)\" -g -O2 +-WX_CXXFLAGS:=$(shell wx-config --cxxflags --version=$(WXVERSION)) -DWX_PRECOMP -Wno-ctor-dtor-privacy -O2 -fno-strict-aliasing ++COMMON_CXXFLAGS+=-Wall -Werror -MT $@ -MD -MP -MF $(@:%.o=%.d) -DVERSION=\"$(VERSION)\" ${CXXFLAGS} ++WX_CXXFLAGS:=$(shell wx-config --cxxflags --version=$(WXVERSION)) -DWX_PRECOMP -Wno-ctor-dtor-privacy ${CXXFLAGS} -fno-strict-aliasing + BOSSA_CXXFLAGS=$(COMMON_CXXFLAGS) $(WX_CXXFLAGS) + BOSSAC_CXXFLAGS=$(COMMON_CXXFLAGS) + BOSSASH_CXXFLAGS=$(COMMON_CXXFLAGS) -Isrc/arm-dis |