Mercurial > illumos > illumos-gate
changeset 14135:62094c23dbe2
3971 remove EXPORT_RELEASE_BUILD
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Tue, 13 Aug 2013 09:50:44 -0400 |
| parents | 720a35f9c957 |
| children | 9178198c46b5 |
| files | usr/src/Makefile.master usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com usr/src/lib/gss_mechs/mech_dummy/Makefile.com usr/src/lib/gss_mechs/mech_spnego/Makefile.com usr/src/lib/libgss/Makefile.com usr/src/tools/scripts/nightly.sh |
| diffstat | 9 files changed, 0 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile.master Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/Makefile.master Tue Aug 13 09:50:44 2013 -0400 @@ -37,11 +37,6 @@ # identification strings. Enabling RELEASE_BUILD automatically enables # INTERNAL_RELEASE_BUILD. # -# EXPORT_RELEASE_BUILD controls whether binaries are built in a form that -# can be released for export under a binary license. It is orthogonal to -# the other *RELEASE_BUILD settings. ("#" means do an export release -# build, "" means do a normal build.) -# # CLOSED_BUILD controls whether we try to build files under # usr/closed. ("" means to build closed code, "#" means don't try to # build it.) Skipping the closed code implies doing an export release @@ -79,9 +74,6 @@ CLOSED_BUILD_1= $(CLOSED_IS_PRESENT:yes=) CLOSED_BUILD= $(CLOSED_BUILD_1:no=$(POUND_SIGN)) -EXPORT_RELEASE_BUILD= $(POUND_SIGN) -$(CLOSED_BUILD)EXPORT_RELEASE_BUILD= - # SPARC_BLD is '#' for an Intel build. # INTEL_BLD is '#' for a Sparc build. SPARC_BLD_1= $(MACH:i386=$(POUND_SIGN)) @@ -932,23 +924,6 @@ ELFSIGN_O= $(TRUE) ELFSIGN_CRYPTO= $(ELFSIGN_O) ELFSIGN_OBJECT= $(ELFSIGN_O) -$(EXPORT_RELEASE_BUILD)ELFSIGN_O = $(ELFSIGN) -$(EXPORT_RELEASE_BUILD)ELFSIGN_CFNAME = SUNWosnetCF -$(EXPORT_RELEASE_BUILD)ELFSIGN_KEY = \ - $(CLOSED)/cmd/cmd-crypto/etc/keys/$(ELFSIGN_CFNAME) -$(EXPORT_RELEASE_BUILD)ELFSIGN_CERT= \ - $(CLOSED)/cmd/cmd-crypto/etc/certs/$(ELFSIGN_CFNAME) -$(EXPORT_RELEASE_BUILD)ELFSIGN_SENAME = SUNWosnetSE -$(EXPORT_RELEASE_BUILD)ELFSIGN_SEKEY = \ - $(CLOSED)/cmd/cmd-crypto/etc/keys/$(ELFSIGN_SENAME) -$(EXPORT_RELEASE_BUILD)ELFSIGN_SECERT= \ - $(CLOSED)/cmd/cmd-crypto/etc/certs/$(ELFSIGN_SENAME) -$(EXPORT_RELEASE_BUILD)ELFSIGN_CRYPTO= $(ELFSIGN_O) sign \ - $(ELFSIGN_FORMAT_OPTION) \ - -k $(ELFSIGN_KEY) -c $(ELFSIGN_CERT) -e $@ -$(EXPORT_RELEASE_BUILD)ELFSIGN_OBJECT= $(ELFSIGN_O) sign \ - $(ELFSIGN_FORMAT_OPTION) \ - -k $(ELFSIGN_SEKEY) -c $(ELFSIGN_SECERT) -e $@ # Rules (normally from make.rules) and macros which are used for post # processing files. Normally, these do stripping of the comment section
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com Tue Aug 13 09:50:44 2013 -0400 @@ -44,10 +44,6 @@ # include library definitions include ../../../../Makefile.lib -MAKEFILE_EXPORT = $(CLOSED)/lib/gss_mechs/mech_dh/backend/Makefile.export -$(EXPORT_RELEASE_BUILD)include $(MAKEFILE_EXPORT) - - CPPFLAGS += -I../mech -I../crypto -I$(SRC)/uts/common/gssapi/include CERRWARN += -_gcc=-Wno-parentheses
--- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com Tue Aug 13 09:50:44 2013 -0400 @@ -40,9 +40,6 @@ # include library definitions include ../../../../Makefile.lib -MAKEFILE_EXPORT = $(CLOSED)/lib/gss_mechs/mech_dh/dh1024/Makefile.export -$(EXPORT_RELEASE_BUILD)include $(MAKEFILE_EXPORT) - CPPFLAGS += -I../../backend/mech -I../../backend/crypto CPPFLAGS += -I$(SRC)/lib/libnsl/include CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
--- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com Tue Aug 13 09:50:44 2013 -0400 @@ -40,9 +40,6 @@ # include library definitions include ../../../../Makefile.lib -MAKEFILE_EXPORT = $(CLOSED)/lib/gss_mechs/mech_dh/dh192/Makefile.export -$(EXPORT_RELEASE_BUILD)include $(MAKEFILE_EXPORT) - CPPFLAGS += -I../../backend/mech -I../../backend/crypto CPPFLAGS += -I$(SRC)/lib/libnsl/include CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
--- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com Tue Aug 13 09:50:44 2013 -0400 @@ -40,9 +40,6 @@ # include library definitions include ../../../../Makefile.lib -MAKEFILE_EXPORT = $(CLOSED)/lib/gss_mechs/mech_dh/dh640/Makefile.export -$(EXPORT_RELEASE_BUILD)include $(MAKEFILE_EXPORT) - CPPFLAGS += -I../../backend/mech -I../../backend/crypto CPPFLAGS += -I$(SRC)/lib/libnsl/include CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
--- a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com Tue Aug 13 09:50:44 2013 -0400 @@ -43,9 +43,6 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized -MAKEFILE_EXPORT = $(CLOSED)/lib/gss_mechs/mech_dummy/Makefile.export -$(EXPORT_RELEASE_BUILD)include $(MAKEFILE_EXPORT) - SRCDIR = ../mech LIBS = $(DYNLIB) LDLIBS += -lgss -lc
--- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com Tue Aug 13 09:50:44 2013 -0400 @@ -48,9 +48,6 @@ CERRWARN += -_gcc=-Wno-unused-function CERRWARN += -_gcc=-Wno-type-limits -MAKEFILE_EXPORT = $(CLOSED)/lib/gss_mechs/mech_spnego/Makefile.export -$(EXPORT_RELEASE_BUILD)include $(MAKEFILE_EXPORT) - .KEEP_STATE: all: $(LIBS)
--- a/usr/src/lib/libgss/Makefile.com Wed Aug 07 13:34:06 2013 -0400 +++ b/usr/src/lib/libgss/Makefile.com Tue Aug 13 09:50:44 2013 -0400 @@ -111,8 +111,6 @@ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-empty-body -$(EXPORT_RELEASE_BUILD)include $(CLOSED)/lib/libgss/Makefile.export - .KEEP_STATE: all: $(LIBS)