Stuart Henderson said:
> On 2016/04/21 19:35, Christian Weisgerber wrote:
>> Dmitrij D. Czarkoff:
>>
>>>> I think you should just set
>>>> INSTALL_STRIP =
>>>> in the ports (or modules) that require it and be done with it.
>>>> No point in introducing yet another variable.
>>>
>>> INSTALL_STRIP is mentioned in mk.conf(5), so it is a user setting.
>>> /etc/mk.conf may contain INSTALL_STRIP=-s, and that would override
>>> INSTALL_STRIP= from port.
>>
>> In practice, INSTALL_STRIP has two possible values: "-s" and "".
>> "-s" is already the default, so the only user setting that makes
>> any sense is "". Having some ports already set it to "" is just
>> fine.
>>
>> A few ports already do this.
>
> Makes sense to me. go-bootstrap needs it too.
Well, then asking for OKs for the following patch.
--
Dmitrij D. Czarkoff
Index: lang/go/Makefile
===================================================================
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- lang/go/Makefile 14 Apr 2016 17:43:26 -0000 1.29
+++ lang/go/Makefile 21 Apr 2016 20:52:41 -0000
@@ -30,6 +30,8 @@ SUBST_VARS = GOCFG
WRKDIST = ${WRKDIR}/go
WRKSRC = ${WRKDIST}/src
+INSTALL_STRIP =
+
GOOS = openbsd
GOARCH = unknown
GOROOT = ${PREFIX}/go
Index: lang/go/go.port.mk
===================================================================
RCS file: /cvs/ports/lang/go/go.port.mk,v
retrieving revision 1.6
diff -u -p -r1.6 go.port.mk
--- lang/go/go.port.mk 28 Feb 2016 13:24:16 -0000 1.6
+++ lang/go/go.port.mk 21 Apr 2016 21:07:40 -0000
@@ -53,6 +53,10 @@ MODGO_INSTALL_TARGET = ${INSTALL_DATA_DI
${MODGO_PACKAGE_PATH};
.endif
+# Although this module does not use INSTALL_PROGRAM, unset INSTALL_STRIP to
+# prevent stripping go programs in ports with custom do-install targets.
+INSTALL_STRIP =
+
MODGO_TEST_TARGET = ${MODGO_TEST_CMD} ${TEST_TARGET}
.if empty(CONFIGURE_STYLE)
Index: lang/go-bootstrap/Makefile
===================================================================
RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- lang/go-bootstrap/Makefile 4 Dec 2015 17:19:18 -0000 1.1.1.1
+++ lang/go-bootstrap/Makefile 21 Apr 2016 20:52:56 -0000
@@ -32,6 +32,8 @@ SUBST_VARS = GOEXE GOCFG
WRKDIST = ${WRKDIR}/go
WRKSRC = ${WRKDIST}/src
+INSTALL_STRIP =
+
GOOS = openbsd
GOARCH = unknown
GOROOT = ${PREFIX}/go/bootstrap
Index: sysutils/logstash/forwarder//Makefile
===================================================================
RCS file: /cvs/ports/sysutils/logstash/forwarder/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- sysutils/logstash/forwarder//Makefile 21 Apr 2016 00:07:08 -0000
1.8
+++ sysutils/logstash/forwarder//Makefile 21 Apr 2016 21:05:45 -0000
@@ -16,9 +16,8 @@ WANTLIB += c pthread
pre-configure:
${SUBST_CMD} ${WRKSRC}/logstash-forwarder.conf.example
-# Use INSTALL_SCRIPT to prevent stripping go binaries
do-install:
- ${INSTALL_SCRIPT} ${MODGO_WORKSPACE}/bin/logstash-forwarder \
+ ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/logstash-forwarder \
${PREFIX}/sbin/
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/logstash-forwarder/
${INSTALL_DATA} ${WRKSRC}/README.md \
