diff options
| author | dsainty <dsainty@pkgsrc.org> | 2015-09-14 03:07:12 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2015-09-14 03:07:12 +0000 |
| commit | 1b52d211c0e44cae19b2e94ea1ddfbed672cc073 (patch) | |
| tree | b536978ecadf76d185e2b28ab3d0c1d74671d00c /converters | |
| parent | 5c4d85a72804760e8f518b7108f1264d9b41db82 (diff) | |
| download | pkgsrc-1b52d211c0e44cae19b2e94ea1ddfbed672cc073.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 libwpd on platforms with a native GCC older than what
boost-libs calls for.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/libwpd/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile index 28403460e5e..90709a8e05c 100644 --- a/converters/libwpd/Makefile +++ b/converters/libwpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2015/08/15 22:46:39 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2015/09/14 03:07:12 dsainty Exp $ DISTNAME= libwpd-0.10.0 PKGREVISION= 1 @@ -18,6 +18,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-docs PKGCONFIG_OVERRIDE+= libwpd.pc.in +.include "../../devel/zlib/buildlink3.mk" +.include "../../converters/librevenge/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) @@ -25,6 +30,4 @@ _WRAP_EXTRA_ARGS.CXX+= -Wno-unused-private-field CWRAPPERS_APPEND.cxx+= -Wno-unused-private-field .endif -.include "../../devel/zlib/buildlink3.mk" -.include "../../converters/librevenge/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |