11461 should use a native link-editor during the build
11463 SUNWonld has passed its use-by date
11464 cmd/sgs/tools should contain tools, not common code
11465 sgsmsg should be built with the rest of the build tools

          --- old/usr/src/cmd/sgs/libconv/Makefile.targ
          +++ new/usr/src/cmd/sgs/libconv/Makefile.targ

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #

  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
  27   27  #
  28   28  
  29      -pics/%.o:       ../common/%.c
       29 +pics/%.o:       $(SRCDIR)/common/%.c
  30   30                  $(COMPILE.c) -o $@ $<
  31   31                  $(POST_PROCESS_O)
  32   32  
  33   33  pics/%.o:       %.s
  34   34                  $(COMPILE.s) -o $@ $<
  35   35                  $(POST_PROCESS_O)
  36   36  
  37      -pics/%32.o:     ../common/%.c
       37 +pics/%32.o:     $(SRCDIR)/common/%.c
  38   38                  $(COMPILE.c) -o $@ $<
  39   39                  $(POST_PROCESS_O)
  40   40  
  41      -pics/%64.o:     ../common/%.c
       41 +pics/%64.o:     $(SRCDIR)/common/%.c
  42   42                  $(COMPILE.c) -D_ELF64 -o $@ $<
  43   43                  $(POST_PROCESS_O)
  44   44  
  45   45  pics/elfcap.o:  $(ELFCAP)/elfcap.c
  46   46                  $(COMPILE.c) -o $@ $(ELFCAP)/elfcap.c
  47   47                  $(POST_PROCESS_O)
  48   48  
  49   49  # This rule generates the report_bufsize.h include file used by libconv
  50   50  # code to ensure that their private buffer size calculations agree with
  51   51  # the public values exposed in sgs/include/conv.h. The limit value
  52   52  # supplied must be larger than the largest buffer used in libconv. There
  53   53  # is little penalty for making it very large, because the header file is
  54   54  # only included in error situations where the compilation will fail.
  55   55  #
  56   56  # We make this depend on Makefile.targ, because a change to Makefile.targ
  57   57  # can change the limit, in which case we want to force everything to rebuild.
  58      -report_bufsize.h:       ../Makefile.targ
  59      -                perl ../../tools/libconv_mk_report_bufsize.pl 8000
       58 +report_bufsize.h:       $(SRCDIR)/Makefile.targ
       59 +                perl $(SRC)/cmd/sgs/tools/libconv_mk_report_bufsize.pl 8000
  60   60  
  61      -../common/%.c ../common/%_machelf.c:    %_msg.h
       61 +$(SRCDIR)/common/%.c $(SRCDIR)/common/%_machelf.c:      %_msg.h
  62   62  
  63      -%_msg.h %_msg.c: $(SGSMSG) ../common/%.msg report_bufsize.h
       63 +%_msg.h + %_msg.c: $(SGSMSG) $(SRCDIR)/common/%.msg report_bufsize.h
  64   64                  $(SGSMSG) $(SGSMSGFLAGS) -h $*_msg.h -d $*_msg.c \
  65   65                          -n sgs_msg_libconv_$* $<
  66   66  
  67      -$(SGSMSG):      FRC
  68      -                @ cd $(SGSTOOLS)/$(MACH); pwd; $(MAKE) catalog
  69      -                @ pwd
  70      -
  71   67  vernote.s:      bld_vernote $(README_REVISION) $(ONLDREADME)
  72   68                  ./bld_vernote \
  73   69                          -R `perl $(README_REVISION) $(ONLDREADME)` \
  74   70                          -r "$(RELEASE)" -o $@
  75   71  
  76      -bld_vernote:    ../common/bld_vernote.ksh
       72 +bld_vernote:    $(SRCDIR)/common/bld_vernote.ksh
  77   73                  $(RM) -f $@
  78      -                cp ../common/bld_vernote.ksh $@
       74 +                cp $(SRCDIR)/common/bld_vernote.ksh $@
  79   75                  chmod a+x $@
  80   76  
  81   77  $(LIBRARY):     pics $$(PICS)
  82   78                  @ $(RM) $(LIBRARY)
  83   79                  $(AR) $(ARFLAGS) $@ $(PICS)
  84   80                  $(POST_PROCESS_A)
  85   81  
  86   82  chkmsg:         $(MSGSRCS)
  87   83                  sh $(CHKMSG) $(CHKMSGFLAGS) $(MSGSRCS)
  88   84  
  89   85  catalog:
  90   86  
  91   87  pics:
  92      -                -@mkdir -p $@
       88 +                $(MKDIR) -p $@
  93   89  
  94   90  clobber:        clean
  95   91                  -$(RM) $(LIBRARY) $(CLOBBERFILES)
  96   92  
  97   93  clean:
  98   94                  -$(RM) $(PICS) $(CLEANFILES)
  99   95  
 100   96  delete:
 101   97  
 102   98  include         $(SRC)/cmd/sgs/Makefile.targ
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX