Print this page
4719 update gate build environment to [open]jdk7 4742 update manifests for javadoc7 4743 Fix deprecated /usr/j2se usage in slp and remove from filesystem(5) manpage 4744 remove traces of /var/sadm/system/admin/default_java Reviewed by: Dan McDonald <danmcd@omniti.com> Reviewed by: Richard Lowe <richlowe@richlowe.net>

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 545 lines elided ↑ open up ↑
 546  546  
 547  547  DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\"       # For messaging.
 548  548  DTS_ERRNO=-D_TS_ERRNO
 549  549  CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \
 550  550          $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \
 551  551          $(ADJUNCT_PROTO:%=-I%/usr/include)
 552  552  CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \
 553  553                  $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include
 554  554  CPPFLAGS=       $(CPPFLAGS.master)
 555  555  AS_CPPFLAGS=    $(CPPFLAGS.master)
 556      -JAVAFLAGS=      -deprecation
      556 +JAVAFLAGS=      -source 1.6 -target 1.6 -Xlint:deprecation,-options
 557  557  
 558  558  #
 559  559  # For source message catalogue
 560  560  #
 561  561  .SUFFIXES: $(SUFFIXES) .i .po
 562  562  MSGROOT= $(ROOT)/catalog
 563  563  MSGDOMAIN= $(MSGROOT)/$(TEXT_DOMAIN)
 564  564  MSGDOMAINPOFILE = $(MSGDOMAIN)/$(POFILE)
 565  565  DCMSGDOMAIN= $(MSGROOT)/LC_TIME/$(TEXT_DOMAIN)
 566  566  DCMSGDOMAINPOFILE = $(DCMSGDOMAIN)/$(DCFILE:.dc=.po)
↓ open down ↓ 594 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX