CVS commit: pkgsrc/geography/gpsd

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Aug 19 23:46:52 UTC 2020

Modified Files:
        pkgsrc/geography/gpsd: Makefile

Log Message:
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.)


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/geography/gpsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gpsd/Makefile
diff -u pkgsrc/geography/gpsd/Makefile:1.51 pkgsrc/geography/gpsd/Makefile:1.52
--- pkgsrc/geography/gpsd/Makefile:1.51 Wed Aug 19 14:22:50 2020
+++ pkgsrc/geography/gpsd/Makefile      Wed Aug 19 23:46:52 2020
@@ -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.