Mercurial Mercurial > upstream > oracle > vpanels / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
13386 various build issues
authorDavid Powell <David.Powell@sun.com>
Tue, 15 Dec 2009 18:07:22 -0800
changeset 395 dceab4d00ec5
parent 394 e80ea21ea90d
child 396 ec97b6c8d665
13386 various build issues
usr/src/Makefile.env file | annotate | diff | comparison | revisions
usr/src/cmd/rad/Makefile file | annotate | diff | comparison | revisions
usr/src/cmd/rad/mod/Makefile file | annotate | diff | comparison | revisions
usr/src/cmd/rad/mod/Makefile.com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/Makefile file | annotate | diff | comparison | revisions
usr/src/pkgdefs/OSOLvpin-hypervisor/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/OSOLvpin/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/publish.ksh file | annotate | diff | comparison | revisions 
--- a/usr/src/Makefile.env	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/Makefile.env	Tue Dec 15 18:07:22 2009 -0800
@@ -71,6 +71,7 @@
 INS.pyfile = $(INS.file); $(TOUCH) -r $< $@
 
 # Tools and dependencies used at build time
+ISA:sh = uname -p
 CHMOD = /usr/bin/chmod
 CP = /usr/bin/cp
 EGREP = /usr/bin/egrep
@@ -88,6 +89,8 @@
 XARGS = /usr/bin/xargs
 PYTHON = /usr/bin/python
 TOUCH = /usr/bin/touch
+CTFMERGE = /opt/onbld/bin/$(ISA)/ctfmerge
+CTFCONVERT = /opt/onbld/bin/$(ISA)/ctfconvert
 
 # Set here explicitly to avoid compiling with newer class version
 JAVAC = /usr/bin/javac
--- a/usr/src/cmd/rad/Makefile	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/cmd/rad/Makefile	Tue Dec 15 18:07:22 2009 -0800
@@ -82,7 +82,7 @@
 
 $(RAD):	$(OBJS)
 	cc -o rad $(OBJS) $(RAD_LDFLAGS)
-	/opt/onbld/bin/i386/ctfmerge -l foo -o $(RAD) $(OBJS)
+	$(CTFMERGE) -l foo -o $(RAD) $(OBJS)
 
 install: $(PROTO_LIB)/rad/rad $(PROTO_MFS_SYSTEM)/rad.xml
 
@@ -100,6 +100,6 @@
 
 .c.o:
 	$(COMPILE.c) $(OUTPUT_OPTIONS) -c $<
-	/opt/onbld/bin/i386/ctfconvert -l foo $@
+	$(CTFCONVERT) -l foo $@
 
 include $(SRC)/Makefile.targ
--- a/usr/src/cmd/rad/mod/Makefile	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/cmd/rad/mod/Makefile	Tue Dec 15 18:07:22 2009 -0800
@@ -26,4 +26,12 @@
 
 include $(SRC)/Makefile.env
 
+PROTO_SUBDIRS = proto_rad
+XPORT_SUBDIRS = xport_pipe xport_socket xport_tls xport_uds
+MODULE_SUBDIRS = files firewall panels sharemgr smf sysid time
+MODULE_SUBDIRS_sparc = $(MODULE_SUBDIRS)
+MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS) hypervisor
+
+SUBDIRS = $(PROTO_SUBDIRS) $(XPORT_SUBDIRS) $(MODULE_SUBDIRS_$(ISA))
+
 include $(SRC)/Makefile.targ
--- a/usr/src/cmd/rad/mod/Makefile.com	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/cmd/rad/mod/Makefile.com	Tue Dec 15 18:07:22 2009 -0800
@@ -39,7 +39,7 @@
 $(MOD_OBJS): $(MOD_API_HDRS)
 $(MOD_LIBNAME):	$(MOD_ALLOBJS)
 	$(LINK.c) -Wl,-M../mapfile.module -G -o $@ $(MOD_ALLOBJS) $(LDLIBS)
-	/opt/onbld/bin/i386/ctfmerge -l foo -o $(MOD_LIBNAME) $(MOD_ALLOBJS)
+	$(CTFMERGE) -l foo -o $(MOD_LIBNAME) $(MOD_ALLOBJS)
 
 $(MOD_API_CFILES) $(MOD_API_HDRS): $(MOD_API_INPUTS) $(ADRLOC)
 	$(ADRGEN) -c $(MOD_API_INPUTS)
@@ -58,9 +58,8 @@
 
 .c.o:
 	$(COMPILE.c) $(OUTPUT_OPTIONS) -c $<
-	/opt/onbld/bin/i386/ctfconvert -l foo $@
+	$(CTFCONVERT) -l foo $@
 
 rad_listen.o: ../rad_listen.c
 	$(COMPILE.c) $(OUTPUT_OPTIONS) -c ../rad_listen.c
-	/opt/onbld/bin/i386/ctfconvert -l foo rad_listen.o
-
+	$(CTFCONVERT) -l foo rad_listen.o
--- a/usr/src/pkgdefs/Makefile	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/pkgdefs/Makefile	Tue Dec 15 18:07:22 2009 -0800
@@ -26,6 +26,20 @@
 
 include Makefile.env
 
+PKG_COMMON = \
+	OSOL0vpanels-doc \
+	OSOLvpin \
+	OSOLvpin-apache \
+	OSOLvpin-examples \
+	OSOLvpin-firewall \
+	OSOLvpin-sharemgr \
+	OSOLvpin-sysid
+
+PKG_i386 = $(PKG_COMMON) OSOLvpin-hypervisor
+PKG_sparc = $(PKG_COMMON)
+
+SUBDIRS = $(PKG_$(ARCH))
+
 include $(SRC)/Makefile.targ
 
 REPO=http://localhost:80
--- a/usr/src/pkgdefs/OSOLvpin-hypervisor/prototype_com	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/pkgdefs/OSOLvpin-hypervisor/prototype_com	Tue Dec 15 18:07:22 2009 -0800
@@ -29,11 +29,11 @@
 i pkginfo
 i copyright
 
+f none usr/lib/rad/module/mod_hypervisor.so 555 root bin
+
 d none usr/share 755 root sys
-
 d none usr/share/applications 755 root other
 f none usr/share/applications/vp-hypervisor.desktop 644 root bin
-
 d none usr/share/vpanels 755 root sys
 d none usr/share/vpanels/panel 755 root sys
 f none usr/share/vpanels/panel/vpanels-panels-hypervisor.jar 644 root sys
--- a/usr/src/pkgdefs/OSOLvpin/prototype_com	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/pkgdefs/OSOLvpin/prototype_com	Tue Dec 15 18:07:22 2009 -0800
@@ -41,7 +41,6 @@
 d none usr/lib/rad/module 755 root bin
 f none usr/lib/rad/module/mod_files.so 555 root bin
 f none usr/lib/rad/module/mod_firewall.so 555 root bin
-f none usr/lib/rad/module/mod_hypervisor.so 555 root bin
 f none usr/lib/rad/module/mod_panels.so 555 root bin
 f none usr/lib/rad/module/mod_sharemgr.so 555 root bin
 f none usr/lib/rad/module/mod_smf.so 555 root bin
--- a/usr/src/pkgdefs/publish.ksh	Tue Dec 15 18:02:26 2009 -0500
+++ b/usr/src/pkgdefs/publish.ksh	Tue Dec 15 18:07:22 2009 -0800
@@ -78,9 +78,11 @@
 pkgsend import OSOLvpin-examples
 pkgsend close
 
-eval `pkgsend open pkg:/OSOLvpanels-hypervisor@$VERSION`
-pkgsend add set name=classification value="Applications/Configuration and Preferences"
-pkgsend add depend type=require fmri=pkg:/OSOLvpanels@$VERSION
-pkgsend add depend type=require fmri=pkg:/SUNWxvm
-pkgsend import OSOLvpin-hypervisor
-pkgsend close
+if [[ `uname -p` = 'i386' ]]; then
+	eval `pkgsend open pkg:/OSOLvpanels-hypervisor@$VERSION`
+	pkgsend add set name=classification value="Applications/Configuration and Preferences"
+	pkgsend add depend type=require fmri=pkg:/OSOLvpanels@$VERSION
+	pkgsend add depend type=require fmri=pkg:/SUNWxvm
+	pkgsend import OSOLvpin-hypervisor
+	pkgsend close
+fi
upstream/oracle/vpanels