diff options
| author | marino <marino@pkgsrc.org> | 2014-04-30 16:30:33 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2014-04-30 16:30:33 +0000 |
| commit | dae96a3d60d90e5d33ac3352b35a761d6d8173e7 (patch) | |
| tree | e000cfb653a170d11dc6b3c132db4772c0a9e138 /www/aws | |
| parent | 9ca750696e8fc4f674f8f777db234db8880d50eb (diff) | |
| download | pkgsrc-dae96a3d60d90e5d33ac3352b35a761d6d8173e7.tar.gz | |
www/aws: Fix after gprbuild update
The new gprbuild configuration files must have a slight difference
because it can no longer work with the standard buildlink. Passing
an additional directory in the pass will fix it though.
Diffstat (limited to 'www/aws')
| -rw-r--r-- | www/aws/Makefile | 18 | ||||
| -rw-r--r-- | www/aws/options.mk | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/www/aws/Makefile b/www/aws/Makefile index cff3fe50653..de94f0e169f 100644 --- a/www/aws/Makefile +++ b/www/aws/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2014/04/28 13:04:20 marino Exp $ +# $NetBSD: Makefile,v 1.16 2014/04/30 16:30:33 marino Exp $ # DISTNAME= aws-${AWS_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www MASTER_SITES= http://downloads.dragonlace.net/src/ EXTRACT_SUFX= .tar.bz2 @@ -23,8 +23,10 @@ USE_LANGUAGES= c ada c++ fortran .include "options.mk" -MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat -MAKE_ENV+= AWK=awk +MY_MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat +MY_MAKE_ENV+= AWK=awk +MY_MAKE_ENV+= PATH=${PREFIX}/gcc-aux/bin:${PATH} +MY_CONF_ENV+= PATH=${PREFIX}/gcc-aux/bin:${PATH} CONFIGURE_ARGS+= LPATH=${PREFIX}/lib ZPATH=/usr/lib # Link options were added for the aws library @@ -46,13 +48,15 @@ GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; GENERATE_PLIST+= ${FIND} * -type f | ${SORT}; do-configure: - cd ${WRKSRC} && ${GMAKE} setup ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${SETENV} ${MY_CONF_ENV} \ + ${GMAKE} setup ${CONFIGURE_ARGS} do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} build build_doc + cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} \ + ${GMAKE} build build_doc do-test: install - cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} \ + cd ${WRKSRC}/regtests && ${SETENV} ${MY_MAKE_ENV} \ python${PYVERSSUFFIX} testsuite.py do-install: diff --git a/www/aws/options.mk b/www/aws/options.mk index c91f5cad0db..b2d035fe4d7 100644 --- a/www/aws/options.mk +++ b/www/aws/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2014/04/28 13:04:20 marino Exp $ +# $NetBSD: options.mk,v 1.9 2014/04/30 16:30:33 marino Exp $ # xmlada is built-in (not optional) due to gprbuild dependency |