diff options
| author | marino <marino@pkgsrc.org> | 2014-05-09 22:45:15 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2014-05-09 22:45:15 +0000 |
| commit | 8c3652c8a995bec8637fbf9b027f3305adfcfdf0 (patch) | |
| tree | e6da05438753fa49225f06588a33baabc6f12c50 /www/aws/Makefile | |
| parent | 9eb944aa287fdc07c1b7a9bd21145633f9c5042d (diff) | |
| download | pkgsrc-8c3652c8a995bec8637fbf9b027f3305adfcfdf0.tar.gz | |
www/aws: Fix build for different zlib and libssl locations
The configuration for the location of libz and libssl both were wrong,
and they were corrected with their respective BUILDLINK_PREFIX.
In addition, regardless of where libssl is located, the standard location
(/usr/include) was searched instead of relative to the library. This
required a patch to the GPR build in order to pass -I<loc> to the
compilation of C files.
The unnecessary removal of empty directories was removed as SunOS find
does not support the -empty switch.
Tested on Joyent dev area where both libz and libssl are not at /usr/lib.
Diffstat (limited to 'www/aws/Makefile')
| -rw-r--r-- | www/aws/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/aws/Makefile b/www/aws/Makefile index de94f0e169f..8ef084a43df 100644 --- a/www/aws/Makefile +++ b/www/aws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/04/30 16:30:33 marino Exp $ +# $NetBSD: Makefile,v 1.17 2014/05/09 22:45:15 marino Exp $ # DISTNAME= aws-${AWS_VERSION} @@ -27,7 +27,8 @@ 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 +CONFIGURE_ARGS+= LPATH=${BUILDLINK_PREFIX.openssl}/lib +CONFIGURE_ARGS+= ZPATH=${BUILDLINK_PREFIX.zlib}/lib # Link options were added for the aws library # "-R" option disables all rpaths except adalib and compiler libs. This is @@ -61,7 +62,6 @@ do-test: install do-install: cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install - @cd ${DESTDIR}/${PREFIX} && ${FIND} * -type d -empty -exec rmdir {} \; .include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/pyversion.mk" |