Re: binutils-2.17 ownership fixes

2016-09-16 Thread Martin Natano 
On Thu, Sep 15, 2016 at 09:07:49PM -0700, Philip Guenther wrote:
> On Thu, Sep 15, 2016 at 1:58 PM, Martin Natano  wrote:
> > This should do it. The 'fix' is ugly, but I couldn't find a cleaner way
> > to pass the right STRIP value to libtool. Any better ideas? Ok?
> ...
> > --- gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  11 Sep 2016 
> > 07:42:02 -  1.9
> > +++ gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  15 Sep 2016 
> > 20:56:45 -
> > @@ -80,6 +80,8 @@ do-config: .USE
> > mv -f Makefile.tmp Makefile
> > cd ${.OBJDIR} && \
> > ${MAKE} ${CONFIGURE_MODULES}
> > +   sed -i 's,^STRIP=strip$$,STRIP=/usr/bin/strip,' \
> > +   ${.OBJDIR}/binutils/libtool
> 
> Instead of hacking the generated libtool post-facto, maybe just
> hardcode a usable value into what generates the script?
> 
> 
> --- ltconfig24 Apr 2011 20:14:40 -  1.1.1.1
> +++ ltconfig16 Sep 2016 03:44:50 -
> @@ -2331,7 +2331,7 @@ LN_S=$LN_S
>  NM=$NM
> 
>  # A symbol stripping program
> -STRIP=$STRIP
> +STRIP=/usr/bin/strip
> 
>  # Used to examine libraries when file_magic_cmd begins "file"
>  MAGIC_CMD=$MAGIC_CMD

That's much nicer. OK, please commit.

Re: binutils-2.17 ownership fixes

2016-09-15 Thread Philip Guenther 
On Thu, Sep 15, 2016 at 1:58 PM, Martin Natano  wrote:
> This should do it. The 'fix' is ugly, but I couldn't find a cleaner way
> to pass the right STRIP value to libtool. Any better ideas? Ok?
...
> --- gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  11 Sep 2016 07:42:02 
> -  1.9
> +++ gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  15 Sep 2016 20:56:45 
> -
> @@ -80,6 +80,8 @@ do-config: .USE
> mv -f Makefile.tmp Makefile
> cd ${.OBJDIR} && \
> ${MAKE} ${CONFIGURE_MODULES}
> +   sed -i 's,^STRIP=strip$$,STRIP=/usr/bin/strip,' \
> +   ${.OBJDIR}/binutils/libtool

Instead of hacking the generated libtool post-facto, maybe just
hardcode a usable value into what generates the script?


--- ltconfig24 Apr 2011 20:14:40 -  1.1.1.1
+++ ltconfig16 Sep 2016 03:44:50 -
@@ -2331,7 +2331,7 @@ LN_S=$LN_S
 NM=$NM

 # A symbol stripping program
-STRIP=$STRIP
+STRIP=/usr/bin/strip

 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=$MAGIC_CMD

Re: binutils-2.17 ownership fixes

2016-09-15 Thread Martin Natano 
> install: strip: No such file or directory
> 
> Is there a better option than removing it again?
> 
> 
> $ cd /usr/src/gnu/usr.bin/binutils-2.17
> $ doas make -f Makefile.bsd-wapper install
> [...]
> Making install in po
> test -z "/usr/bin" || /bin/sh 
> /usr/src/gnu/usr.bin/binutils-2.17/binutils/../mkinstalldirs "/usr/bin"
>   /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
> 'objdump' '/usr/bin/objdump'
> install -c -S -o root -g bin -m 555 -s objdump /usr/bin/objdump
> install: strip: No such file or directory
>   /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
> 'ar' '/usr/bin/ar'
> install -c -S -o root -g bin -m 555 -s ar /usr/bin/ar
> install: strip: No such file or directory
>   /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
> 'strings' '/usr/bin/strings'
> install -c -S -o root -g bin -m 555 -s strings /usr/bin/strings
> install: strip: No such file or directory
>   /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
> 'ranlib' '/usr/bin/ranlib'
> install -c -S -o root -g bin -m 555 -s ranlib /usr/bin/ranlib
> install: strip: No such file or directory
>   /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
> 'objcopy' '/usr/bin/objcopy'
> install -c -S -o root -g bin -m 555 -s objcopy /usr/bin/objcopy
> install: strip: No such file or directory
>   /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
> 'addr2line' '/usr/bin/addr2line'
> install -c -S -o root -g bin -m 555 -s addr2line /usr/bin/addr2line
> install: strip: No such file or directory
>   /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
> 'readelf' '/usr/bin/readelf'
> install -c -S -o root -g bin -m 555 -s readelf /usr/bin/readelf
> install: strip: No such file or directory
>  /bin/sh ./libtool  --mode=install install -c -S -s -o root -g bin -m 555 
> strip-new /usr/bin/strip
> install -c -S -o root -g bin -m 555 -s strip-new /usr/bin/strip
> install: strip: No such file or directory
> [...]
> 

This should do it. The 'fix' is ugly, but I couldn't find a cleaner way
to pass the right STRIP value to libtool. Any better ideas? Ok?

Index: gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
===
RCS file: /cvs/src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.bsd-wrapper
--- gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  11 Sep 2016 07:42:02 
-  1.9
+++ gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  15 Sep 2016 20:56:45 
-
@@ -80,6 +80,8 @@ do-config: .USE
mv -f Makefile.tmp Makefile
cd ${.OBJDIR} && \
${MAKE} ${CONFIGURE_MODULES}
+   sed -i 's,^STRIP=strip$$,STRIP=/usr/bin/strip,' \
+   ${.OBJDIR}/binutils/libtool
 
 gas/doc/as.1: config.status
cd ${.OBJDIR}/gas/doc && ${MAKE} as.1

Re: binutils-2.17 ownership fixes

2016-09-15 Thread Jeremie Courreges-Anglas 
Theo Buehler  writes:

> On Sat, Sep 10, 2016 at 07:01:20PM -0700, Philip Guenther wrote:
>> On Sat, 10 Sep 2016, Philip Guenther wrote:
>> > Same diff as binutils, with same open question:
>> > 
>> > > Maybe we should add ${INSTALL_STRIP} to the INSTALL_PROGRAM assignment 
>> > > here?
>> 
>> Here's the combined diff that does that.
>> 
>> (Note to self: if you set DEBUG in /etc/mk.conf, INSTALL_STRIP isn't set)
>> 
>> ok?
>
> Adding ${INSTALL_STRIP} here resulted in 10 times the following warning
> during 'make build':
>
> install: strip: No such file or directory

I saw the same thing today, but did not investigate.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: binutils-2.17 ownership fixes

2016-09-15 Thread Theo Buehler 
On Sat, Sep 10, 2016 at 07:01:20PM -0700, Philip Guenther wrote:
> On Sat, 10 Sep 2016, Philip Guenther wrote:
> > Same diff as binutils, with same open question:
> > 
> > > Maybe we should add ${INSTALL_STRIP} to the INSTALL_PROGRAM assignment 
> > > here?
> 
> Here's the combined diff that does that.
> 
> (Note to self: if you set DEBUG in /etc/mk.conf, INSTALL_STRIP isn't set)
> 
> ok?

Adding ${INSTALL_STRIP} here resulted in 10 times the following warning
during 'make build':

install: strip: No such file or directory

Is there a better option than removing it again?


$ cd /usr/src/gnu/usr.bin/binutils-2.17
$ doas make -f Makefile.bsd-wapper install
[...]
Making install in po
test -z "/usr/bin" || /bin/sh 
/usr/src/gnu/usr.bin/binutils-2.17/binutils/../mkinstalldirs "/usr/bin"
  /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
'objdump' '/usr/bin/objdump'
install -c -S -o root -g bin -m 555 -s objdump /usr/bin/objdump
install: strip: No such file or directory
  /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 'ar' 
'/usr/bin/ar'
install -c -S -o root -g bin -m 555 -s ar /usr/bin/ar
install: strip: No such file or directory
  /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
'strings' '/usr/bin/strings'
install -c -S -o root -g bin -m 555 -s strings /usr/bin/strings
install: strip: No such file or directory
  /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
'ranlib' '/usr/bin/ranlib'
install -c -S -o root -g bin -m 555 -s ranlib /usr/bin/ranlib
install: strip: No such file or directory
  /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
'objcopy' '/usr/bin/objcopy'
install -c -S -o root -g bin -m 555 -s objcopy /usr/bin/objcopy
install: strip: No such file or directory
  /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
'addr2line' '/usr/bin/addr2line'
install -c -S -o root -g bin -m 555 -s addr2line /usr/bin/addr2line
install: strip: No such file or directory
  /bin/sh ./libtool --mode=install install -c -S -s -o root -g bin -m 555 
'readelf' '/usr/bin/readelf'
install -c -S -o root -g bin -m 555 -s readelf /usr/bin/readelf
install: strip: No such file or directory
 /bin/sh ./libtool  --mode=install install -c -S -s -o root -g bin -m 555 
strip-new /usr/bin/strip
install -c -S -o root -g bin -m 555 -s strip-new /usr/bin/strip
install: strip: No such file or directory
[...]

Re: binutils-2.17 ownership fixes

2016-09-11 Thread Martin Natano 
> Index: gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
> ===
> RCS file: 
> /data/src/openbsd/src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile.bsd-wrapper
> --- gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper5 Jul 2013 21:29:51 
> -   1.8
> +++ gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper11 Sep 2016 01:54:10 
> -
> @@ -102,7 +102,8 @@ install: maninstall
>   tooldir=${PREFIX} \
>   BSDSRCDIR=${BSDSRCDIR} \
>   INSTALL_MODULES='${INSTALL_MODULES}' \
> - INSTALL_PROGRAM='install -c -S' \
> + INSTALL_PROGRAM='install -c -S ${INSTALL_STRIP} -o ${BINOWN} -g 
> ${BINGRP} -m ${BINMODE}' \
> + INSTALL_DATA='install -c -o ${BINOWN} -g ${DOCGRP} -m 
> ${NONBINMODE}' \

I think that should be ${DOCOWN} not ${BINOWN} for INSTALL_DATA,
otherwise OK natano@.


>   INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
> install install-info
>  
> Index: gnu/usr.bin/binutils/Makefile.bsd-wrapper
> ===
> RCS file: /data/src/openbsd/src/gnu/usr.bin/binutils/Makefile.bsd-wrapper,v
> retrieving revision 1.83
> diff -u -p -r1.83 Makefile.bsd-wrapper
> --- gnu/usr.bin/binutils/Makefile.bsd-wrapper 1 Jun 2015 17:36:19 -   
> 1.83
> +++ gnu/usr.bin/binutils/Makefile.bsd-wrapper 11 Sep 2016 01:54:15 -
> @@ -81,7 +81,8 @@ install: maninstall
>   tooldir=${PREFIX} \
>   BSDSRCDIR=${BSDSRCDIR} \
>   INSTALL_MODULES='${INSTALL_MODULES}' \
> - INSTALL_PROGRAM='install -c -S' \
> + INSTALL_PROGRAM='install -c -S ${INSTALL_STRIP} -o ${BINOWN} -g 
> ${BINGRP} -m ${BINMODE}' \
> + INSTALL_DATA='install -c -o ${BINOWN} -g ${DOCGRP} -m 
> ${NONBINMODE}' \

same here


>   INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
> install install-info
>

Re: binutils-2.17 ownership fixes

2016-09-10 Thread Philip Guenther 
On Sat, 10 Sep 2016, Philip Guenther wrote:
> Same diff as binutils, with same open question:
> 
> > Maybe we should add ${INSTALL_STRIP} to the INSTALL_PROGRAM assignment 
> > here?

Here's the combined diff that does that.

(Note to self: if you set DEBUG in /etc/mk.conf, INSTALL_STRIP isn't set)

ok?

Philip


Index: gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
===
RCS file: /data/src/openbsd/src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.bsd-wrapper
--- gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  5 Jul 2013 21:29:51 
-   1.8
+++ gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper  11 Sep 2016 01:54:10 
-
@@ -102,7 +102,8 @@ install: maninstall
tooldir=${PREFIX} \
BSDSRCDIR=${BSDSRCDIR} \
INSTALL_MODULES='${INSTALL_MODULES}' \
-   INSTALL_PROGRAM='install -c -S' \
+   INSTALL_PROGRAM='install -c -S ${INSTALL_STRIP} -o ${BINOWN} -g 
${BINGRP} -m ${BINMODE}' \
+   INSTALL_DATA='install -c -o ${BINOWN} -g ${DOCGRP} -m 
${NONBINMODE}' \
INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
  install install-info
 
Index: gnu/usr.bin/binutils/Makefile.bsd-wrapper
===
RCS file: /data/src/openbsd/src/gnu/usr.bin/binutils/Makefile.bsd-wrapper,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile.bsd-wrapper
--- gnu/usr.bin/binutils/Makefile.bsd-wrapper   1 Jun 2015 17:36:19 -   
1.83
+++ gnu/usr.bin/binutils/Makefile.bsd-wrapper   11 Sep 2016 01:54:15 -
@@ -81,7 +81,8 @@ install: maninstall
tooldir=${PREFIX} \
BSDSRCDIR=${BSDSRCDIR} \
INSTALL_MODULES='${INSTALL_MODULES}' \
-   INSTALL_PROGRAM='install -c -S' \
+   INSTALL_PROGRAM='install -c -S ${INSTALL_STRIP} -o ${BINOWN} -g 
${BINGRP} -m ${BINMODE}' \
+   INSTALL_DATA='install -c -o ${BINOWN} -g ${DOCGRP} -m 
${NONBINMODE}' \
INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
  install install-info

binutils-2.17 ownership fixes

2016-09-10 Thread Philip Guenther 

Same diff as binutils, with same open question:

> Maybe we should add ${INSTALL_STRIP} to the INSTALL_PROGRAM assignment 
> here?

ok?


Index: usr.bin/binutils-2.17/Makefile.bsd-wrapper
===
RCS file: /data/src/openbsd/src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.bsd-wrapper
--- usr.bin/binutils-2.17/Makefile.bsd-wrapper  5 Jul 2013 21:29:51 -   
1.8
+++ usr.bin/binutils-2.17/Makefile.bsd-wrapper  10 Sep 2016 21:42:14 -
@@ -102,7 +102,8 @@ install: maninstall
tooldir=${PREFIX} \
BSDSRCDIR=${BSDSRCDIR} \
INSTALL_MODULES='${INSTALL_MODULES}' \
-   INSTALL_PROGRAM='install -c -S' \
+   INSTALL_PROGRAM='install -c -S -o ${BINOWN} -g ${BINGRP} -m 
${BINMODE}' \
+   INSTALL_DATA='install -c -o ${BINOWN} -g ${DOCGRP} -m 
${NONBINMODE}' \
INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \
  install install-info