svn commit: r302391 - head

[Warner Losh]

On Thu, Jul 7, 2016 at 12:08 PM, Bryan Drewery <bdrewery at freebsd.org> wrote:
> On 7/7/16 8:25 AM, Andrew Turner wrote:
>> Author: andrew
>> Date: Thu Jul  7 15:25:14 2016
>> New Revision: 302391
>> URL: https://svnweb.freebsd.org/changeset/base/302391
>>
>> Log:
>>   Stop deleting ofwdump.8.gz on arm and arm64 when running make delete-old,
>>   it is installed on these architectures.
>>
>>   Approved by:        re (kib)
>>   Sponsored by:       ABT Systems Ltd
>>
>> Modified:
>>   head/ObsoleteFiles.inc
>>
>> Modified: head/ObsoleteFiles.inc
>> ==============================================================================
>> --- head/ObsoleteFiles.inc    Thu Jul  7 14:29:23 2016        (r302390)
>> +++ head/ObsoleteFiles.inc    Thu Jul  7 15:25:14 2016        (r302391)
>> @@ -8014,7 +8014,9 @@ OLD_FILES+=usr/share/man/man5/usbd.conf.
>>  .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
>>  OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
>>  .endif
>> -.if ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && ${TARGET_ARCH} != "sparc64"
>> +.if ${TARGET_ARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm" && \
>
> TARGET_CPUARCH is not valid here.

Also, shouldn't we have some MK variable that controls this in the
first place? This ifdef soup needs
to be cleaned up.

Warner


> # make check-old
> make[1]: "/root/git/freebsd/ObsoleteFiles.inc" line 8019: Malformed
> conditional (${TARGET_ARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm"
> &&  ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" &&
> ${TARGET_ARCH} != "sparc64")
> make[1]: Fatal errors encountered -- cannot continue
> make[1]: stopped in /root/git/freebsd
>
>> +    ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
>> +    ${TARGET_ARCH} != "sparc64"
>>  OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
>>  .endif
>>  OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
>>
>
>
> --
> Regards,
> Bryan Drewery
>