diff options
| author | gdt <gdt@pkgsrc.org> | 2020-08-19 23:46:52 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2020-08-19 23:46:52 +0000 |
| commit | 810b888014ac74c51eed415f1ddcf1faec9cbe4a (patch) | |
| tree | 48da4e997673765a9e71e02aef366e48ad84ab4e /geography/gpsd | |
| parent | bfa368c38aba79ab0a859542203f1a7c95efa26e (diff) | |
| download | pkgsrc-810b888014ac74c51eed415f1ddcf1faec9cbe4a.tar.gz | |
geography/gpsd: Work around three scons problems
Upstream's scons builds and links during the install phase, and
previously we did not pass MAKE_ENV in the install phase.
The other bug is that pkgsrc doesn't have scons support, so this is
all ad hoc.
The final bug is scons, which has not yet risen to reinvent autoconf.
(Probably this fixes RELRO.)
Diffstat (limited to 'geography/gpsd')
| -rw-r--r-- | geography/gpsd/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/geography/gpsd/Makefile b/geography/gpsd/Makefile index 60e7556fbcb..af455bafbe3 100644 --- a/geography/gpsd/Makefile +++ b/geography/gpsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2020/08/19 14:22:50 gdt Exp $ +# $NetBSD: Makefile,v 1.52 2020/08/19 23:46:52 gdt Exp $ DISTNAME= gpsd-3.21 CATEGORIES= geography @@ -51,12 +51,6 @@ SUBST_STAGE.pyenv= pre-build SUBST_FILES.pyenv+= tests/test_misc.py SUBST_SED.pyenv= -e 's,/usr/bin/env python.*$$,${PYTHONBIN},' -# \todo: RELRO fails, and it appears to be an upstream problem. -# Reported upstream on 20200819. -# https://lists.nongnu.org/archive/html/gpsd-dev/2020-08/msg00091.html -# Currently believed to be an upstream problem; please fix upstream -# rather than here. - # \todo: Determine if CC/CXX are needed (e.g, when using other than gcc). # CC=${CC:Q} CXX=${CXX:Q} do-build: @@ -68,11 +62,11 @@ do-build: do-install: cd ${WRKSRC} && \ - ${SETENV} ${INSTALL_ENV} ${SCONSBIN} install + ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} install do-test: cd ${WRKSRC} && \ - ${SETENV} ${INSTALL_ENV} ${SCONSBIN} check + ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${SCONSBIN} check # Upstream does not document the minimum version; hope this is ok. # \todo Pick a ruby version dynamically. |