[pkgsrc/trunk]: pkgsrc/geography/gpsd geography/gpsd: Work around three scons...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/32b62eb61592
branches:  trunk
changeset: 437281:32b62eb61592
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Aug 19 23:46:52 2020 +0000

description:
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:

 geography/gpsd/Makefile |  12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (36 lines):

diff -r d78de36a1cfd -r 32b62eb61592 geography/gpsd/Makefile
--- a/geography/gpsd/Makefile   Wed Aug 19 23:33:49 2020 +0000
+++ b/geography/gpsd/Makefile   Wed Aug 19 23:46:52 2020 +0000
@@ -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_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-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.