diff options
| author | dsainty <dsainty@pkgsrc.org> | 2015-09-14 03:09:00 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2015-09-14 03:09:00 +0000 |
| commit | 531ec4532b5ad19549f4ba588243395570e17ed2 (patch) | |
| tree | cffba153fe50d49441fd5c9b2a663f6e302e7497 /converters | |
| parent | c900cf8e9197de521b0413b80dec0a18b4d1418f (diff) | |
| download | pkgsrc-531ec4532b5ad19549f4ba588243395570e17ed2.tar.gz | |
Include all buildlink3.mk before compiler.mk, as the buildlink dependencies
may alter the compiler selection.
In this particular case, librevenge depends on boost-libs, which will
set GCC_REQD and possibly select a GCC dependency, so long as the compiler
hasn't been forcibly pre-selected by including compiler.mk too early.
Fixes build of libwpg on platforms with a native GCC older than what
boost-libs calls for.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libwpg/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/converters/libwpg/Makefile b/converters/libwpg/Makefile index c64fe24d557..aca8fb6146b 100644 --- a/converters/libwpg/Makefile +++ b/converters/libwpg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/08/15 22:46:39 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2015/09/14 03:09:00 dsainty Exp $ DISTNAME= libwpg-0.3.0 PKGREVISION= 2 @@ -20,13 +20,16 @@ PKGCONFIG_OVERRIDE+= libwpg.pc.in REPLACE_PERL= src/conv/svg/wpg2svgbatch.pl +.include "../../converters/libwpd/buildlink3.mk" +.include "../../converters/librevenge/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" + +# Include all buildlink3.mk before compiler.mk, as the buildlink dependencies +# may alter the compiler selection. .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) BUILDLINK_TRANSFORM+= rm:-Werror .endif -.include "../../converters/libwpd/buildlink3.mk" -.include "../../converters/librevenge/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |