Mercurial > illumos > illumos-gate
changeset 5303:97e95cb2f469
6599659 Makefiles shouldn't have to tear $(RELEASE) apart
Contributed by Roland Mainz <roland.mainz@nrubsig.org>
author | meem |
---|---|
date | Mon, 22 Oct 2007 16:50:32 -0700 |
parents | eec6aeacde6e |
children | adafb3d75449 |
files | usr/src/Makefile.master usr/src/cmd/ipf/Makefile.ipf usr/src/cmd/sendmail/Makefile.cmd usr/src/lib/libast/amd64/Makefile usr/src/lib/libast/i386/Makefile usr/src/lib/libast/sparc/Makefile usr/src/lib/libast/sparcv9/Makefile usr/src/lib/libdll/amd64/Makefile usr/src/lib/libdll/i386/Makefile usr/src/lib/libdll/sparc/Makefile usr/src/lib/libdll/sparcv9/Makefile usr/src/uts/intel/ipf/Makefile usr/src/uts/sparc/ipf/Makefile |
diffstat | 13 files changed, 20 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile.master Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/Makefile.master Mon Oct 22 16:50:32 2007 -0700 @@ -874,6 +874,8 @@ # which is used to label all binaries in the build: # # RELEASE Specific release of the build, eg: 5.2 +# RELEASE_MAJOR Major version number part of $(RELEASE) +# RELEASE_MINOR Minor version number part of $(RELEASE) # VERSION Version of the build (alpha, beta, Generic) # PATCHID If this is a patch this value should contain # the patchid value (eg: "Generic 100832-01"), otherwise @@ -883,7 +885,9 @@ # will default to the RELEASE_DATE # ONVERS= "11.11" -RELEASE= 5.11 +RELEASE_MAJOR= 5 +RELEASE_MINOR= 11 +RELEASE= $(RELEASE_MAJOR).$(RELEASE_MINOR) VERSION= SunOS Development PATCHID= $(VERSION) RELEASE_DATE= October 2007
--- a/usr/src/cmd/ipf/Makefile.ipf Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/cmd/ipf/Makefile.ipf Mon Oct 22 16:50:32 2007 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -14,6 +14,5 @@ COMMONIPF= $(SRC)/uts/common/inet/ipf KERNELIPF= $(SRC)/uts/common/inet/pfil -MINOR= echo $(RELEASE) | cut -d. -f2 CPPFLAGS += -I$(COMMONIPF) -I$(KERNELIPF) -DSUNDDI -DUSE_INET6 \ - -DSOLARIS2=$(MINOR:sh) + -DSOLARIS2=$(RELEASE_MINOR)
--- a/usr/src/cmd/sendmail/Makefile.cmd Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/cmd/sendmail/Makefile.cmd Mon Oct 22 16:50:32 2007 -0700 @@ -20,11 +20,12 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # -CPPFLAGS.sm= $(CPPFLAGS.master) -DSOLARIS=21100 -D_FILE_OFFSET_BITS=64 +CPPFLAGS.sm= $(CPPFLAGS.master) -DSOLARIS=2$(RELEASE_MINOR)00 \ + -D_FILE_OFFSET_BITS=64 DBMDEF= -DNDBM -DNEWDB -DNIS -DNISPLUS -DUSERDB -DMAP_REGEX -DLDAPMAP
--- a/usr/src/lib/libast/amd64/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libast/amd64/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).i386"' +ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).i386"' # platform-specific sources OBJECTS = \
--- a/usr/src/lib/libast/i386/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libast/i386/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).i386"' +ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).i386"' # platform-specific sources OBJECTS = \
--- a/usr/src/lib/libast/sparc/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libast/sparc/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).sun4"' +ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).sun4"' # platform-specific sources OBJECTS = \
--- a/usr/src/lib/libast/sparcv9/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libast/sparcv9/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).sun4"' +ASTPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).sun4"' # platform-specific sources OBJECTS = \
--- a/usr/src/lib/libdll/amd64/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libdll/amd64/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).i386"' +DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).i386"' include ../Makefile.com include ../../Makefile.lib.64
--- a/usr/src/lib/libdll/i386/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libdll/i386/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).i386"' +DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).i386"' include ../Makefile.com
--- a/usr/src/lib/libdll/sparc/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libdll/sparc/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).sun4"' +DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).sun4"' include ../Makefile.com
--- a/usr/src/lib/libdll/sparcv9/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/lib/libdll/sparcv9/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -25,12 +25,9 @@ # ident "%Z%%M% %I% %E% SMI" # -# Fetch minor version from RELEASE, e.g. "10" for "5.10", "11" for "5.11" etc. -GETRELEASEMINOR = /usr/bin/ksh -c 'x=$(RELEASE) ; print "$${x$(POUND_SIGN)$(POUND_SIGN)*.}"' - # Platform-specific config # Note that "HOSTTYPE" matches the value used by AT&T upstream. -DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(GETRELEASEMINOR:sh).sun4"' +DLLPLATFORMCPPFLAGS = '-DHOSTTYPE="sol$(RELEASE_MINOR).sun4"' include ../Makefile.com include ../../Makefile.lib.64
--- a/usr/src/uts/intel/ipf/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/uts/intel/ipf/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -58,9 +58,8 @@ LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -MINOR= echo $(RELEASE) | cut -d. -f2 CPPFLAGS += -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP -DUSE_INET6 -CPPFLAGS += -DSUNDDI -DSOLARIS2=$(MINOR:sh) -DIRE_ILL_CN +CPPFLAGS += -DSUNDDI -DSOLARIS2=$(RELEASE_MINOR) -DIRE_ILL_CN LDFLAGS += -dy -Ndrv/ip -Nmisc/md5 -Nmisc/neti INC_PATH += -I$(UTSBASE)/common/inet/ipf
--- a/usr/src/uts/sparc/ipf/Makefile Mon Oct 22 15:49:36 2007 -0700 +++ b/usr/src/uts/sparc/ipf/Makefile Mon Oct 22 16:50:32 2007 -0700 @@ -62,10 +62,9 @@ # # lint pass one enforcement and OS version # -MINOR= echo $(RELEASE) | cut -d. -f2 CFLAGS += $(CCVERBOSE) CPPFLAGS += -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP -CPPFLAGS += -DSUNDDI -DSOLARIS2=$(MINOR:sh) -DIRE_ILL_CN -DUSE_INET6 +CPPFLAGS += -DSUNDDI -DSOLARIS2=$(RELEASE_MINOR) -DIRE_ILL_CN -DUSE_INET6 LDFLAGS += -dy -Ndrv/ip -Nmisc/md5 -Nmisc/neti INC_PATH += -I$(UTSBASE)/common/inet/ipf