Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / 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.
6982811 64 bit Xvnc server and Tiger Vncviewer support
authorArvind Umrao <Arvind.Umrao@Sun.COM>
Thu, 21 Oct 2010 21:27:50 -0700
changeset 1019 2479b048f8d0
parent 1018 baa7bc85407b
child 1020 289eb346d944
6982811 64 bit Xvnc server and Tiger Vncviewer support
open-src/xserver/xvnc/Makefile file | annotate | diff | comparison | revisions
pkg/manifests/desktop-remote-desktop-tigervnc.mf file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xvnc.mf file | annotate | diff | comparison | revisions 
--- a/open-src/xserver/xvnc/Makefile	Thu Oct 21 14:40:25 2010 -0700
+++ b/open-src/xserver/xvnc/Makefile	Thu Oct 21 21:27:50 2010 -0700
@@ -26,6 +26,11 @@
 # DEALINGS IN THE SOFTWARE.
 #
 #
+# Build 32-bit or 64-bit?
+BUILD_TYPES_SET=yes
+BUILD_TYPES_sparc=64
+BUILD_TYPES_i386=32 64
+BUILD_TYPES=$(BUILD_TYPES_$(MACH))
 
 # Package name used in tarballs
 MODULE_NAME=tigervnc
@@ -111,6 +116,7 @@
 BUILD_TARGETS_SET=yes
 INSTALL_TARGETS_common=Xvnc_install_module
 INSTALL_TARGETS_32=Xvnc_install_programs java_install
+INSTALL_TARGETS_64=Xvnc_install_programs
 INSTALL_TARGETS=$(INSTALL_TARGETS_common) $(INSTALL_TARGETS_$(BUILD_TYPE))
 INSTALL_TARGETS_SET=yes
 
@@ -122,10 +128,6 @@
 INSTALL_TARGETS_sparc = install_mdb
 INSTALL_TARGETS += $(INSTALL_TARGETS_$(MACH))
 
-# Since we only build Xvnc in 32-bit mode, don't need ARCHBINSUBDIR set
-# like in the Xorg builds
-MODULE_BUILD_32_FLAGS = ARCHBINSUBDIR=""
-
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = Xvnc
 
@@ -226,7 +228,7 @@
 	 CPPROG="cp -p" install)
 
 Xvnc_install_programs: $(BUILD_TARGETS)
-	mkdir -p $(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR) \
+	mkdir -p $(PROTODIR)/usr/bin/$(ARCHBINSUBDIR) \
 		$(PROTODIR)/usr/share/man/man1 \
 		$(PROTODIR)$(SMF_MANIFEST_DIR)/application/x11 
 	$(INSTALL_SCRIPT) -m 0755 $(SOURCE_DIR)/unix/vncserver \
@@ -234,7 +236,7 @@
 		$(SOURCE_DIR)/unix/vncconfig/vncconfig \
 		$(SOURCE_DIR)/unix/vncviewer/vncviewer \
 		$(SOURCE_DIR)/unix/x0vncserver/x0vncserver \
-		$(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR)
+		$(PROTODIR)/usr/bin/$(ARCHBINSUBDIR)
 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncserver.man \
 		$(PROTODIR)/usr/share/man/man1/vncserver.1
 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncconfig/vncconfig.man \
--- a/pkg/manifests/desktop-remote-desktop-tigervnc.mf	Thu Oct 21 14:40:25 2010 -0700
+++ b/pkg/manifests/desktop-remote-desktop-tigervnc.mf	Thu Oct 21 21:27:50 2010 -0700
@@ -26,11 +26,16 @@
 set name=pkg.summary value="TigerVNC client"
 dir path=usr
 dir path=usr/bin
+$(i386_ONLY)dir path=usr/bin/$(ARCH32)
+$(i386_ONLY)dir path=usr/bin/$(ARCH64)
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/vncviewer
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/vncviewer
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/vncviewer
+$(sparc_ONLY)file path=usr/bin/vncviewer
 file path=usr/share/man/man1/vncviewer.1
+$(i386_ONLY)hardlink path=usr/bin/vncviewer target=../lib/isaexec
 legacy pkg=SUNWvncviewer \
     desc="VNC client based on the TigerVNC open source release that displays a session over RFB protocol from a VNC server" \
     name="VNC viewer client"
--- a/pkg/manifests/x11-server-xvnc.mf	Thu Oct 21 14:40:25 2010 -0700
+++ b/pkg/manifests/x11-server-xvnc.mf	Thu Oct 21 21:27:50 2010 -0700
@@ -32,6 +32,8 @@
 dir path=usr/X11
 dir path=usr/X11/bin
 dir path=usr/bin
+$(i386_ONLY)dir path=usr/bin/$(ARCH32)
+$(i386_ONLY)dir path=usr/bin/$(ARCH64)
 dir path=usr/lib/mdb
 dir path=usr/lib/mdb/proc
 $(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
@@ -42,11 +44,21 @@
 dir path=usr/share/vnc
 dir path=usr/share/vnc/classes
 file path=lib/svc/manifest/application/x11/xvnc-inetd.xml
-file path=usr/bin/Xvnc group=root mode=2555
-file path=usr/bin/vncconfig
-file path=usr/bin/vncpasswd
-file path=usr/bin/vncserver
-file path=usr/bin/x0vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/Xvnc group=root mode=2555
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/vncconfig
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/vncpasswd
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/x0vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/Xvnc group=root mode=2555
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/vncconfig
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/vncpasswd
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/x0vncserver
+$(sparc_ONLY)file path=usr/bin/Xvnc group=root mode=2555
+$(sparc_ONLY)file path=usr/bin/vncconfig
+$(sparc_ONLY)file path=usr/bin/vncpasswd
+$(sparc_ONLY)file path=usr/bin/vncserver
+$(sparc_ONLY)file path=usr/bin/x0vncserver
 file path=usr/share/man/man1/Xvnc.1
 file path=usr/share/man/man1/vncconfig.1
 file path=usr/share/man/man1/vncpasswd.1
@@ -61,8 +73,14 @@
 legacy pkg=SUNWxvnc \
     desc="X Window System server based on X.Org Foundation open source release and TigerVNC open source release that displays over RFB protocol to a VNC client" \
     name="X11/VNC server"
+$(i386_ONLY)hardlink path=usr/bin/Xvnc target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/vncconfig target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/vncpasswd target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/vncserver target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/x0vncserver target=../lib/isaexec
 link path=usr/X11/bin/Xvnc target=../../bin/Xvnc
 link path=usr/lib/mdb/proc/Xvnc.so target=Xserver.so
+link path=usr/lib/mdb/proc/$(ARCH64)/Xvnc.so target=Xserver.so
 # /usr/bin/vncserver is a perl script, but pkgdep doesn't pick up the
 # dependency automatically
 depend fmri=pkg:/runtime/perl-584 type=require
upstream/oracle/x-cons/x-s12-clone