[csw-devel] SF.net SVN: gar:[7312] csw/mgar/pkg/tightvnc/trunk

[wahwah at users.sourceforge.net]

Revision: 7312
          http://gar.svn.sourceforge.net/gar/?rev=7312&view=rev
Author:   wahwah
Date:     2009-11-16 15:46:30 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
vncserver: Injecting  into EXTRA_DEFINES to achieve compilation for the right architecture (and avoid V8+)

Modified Paths:
--------------
    csw/mgar/pkg/tightvnc/trunk/Makefile
    csw/mgar/pkg/tightvnc/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch

Removed Paths:
-------------
    csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch

Modified: csw/mgar/pkg/tightvnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/Makefile	2009-11-16 15:45:49 UTC (rev 7311)
+++ csw/mgar/pkg/tightvnc/trunk/Makefile	2009-11-16 15:46:30 UTC (rev 7312)
@@ -56,7 +56,7 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = vnc
 PATCHFILES  = 0001-Sun-compiler-in-sun.cf.patch
-PATCHFILES += 0003-GNU-make-by-default.patch
+PATCHFILES += 0002-GNU-make-by-default.patch
 PATCHFILES += 0003-libdix.a-after-libos.a.patch
 PATCHFILES += 0001-Force-the-use-of-libwrap.patch
 
@@ -73,17 +73,18 @@
 build-vnc:
 	(cd $(WORKSRC) && $(BUILD_ENV) \
 		EXTRA_INCLUDES="-I/opt/csw/include" \
+		EXTRA_DEFINES="$(CFLAGS)" \
 		LOCAL_LDFLAGS="-L/opt/csw/lib" \
 		gmake World)
 	(cd $(WORKSRC)/Xvnc && $(CONFIGURE_ENV) \
 		EXTRA_LIBRARIES="-lwrap -lsocket" \
-		EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
+		EXTRA_DEFINES="-DUSE_LIBWRAP=1 $(CFLAGS)" \
 		EXTRA_INCLUDES="-I/opt/csw/include" \
 		LOCAL_LDFLAGS="-L/opt/csw/lib" \
 		./configure)
 	(cd $(WORKSRC)/Xvnc && $(BUILD_ENV) \
 		EXTRA_LIBRARIES="-lwrap -lsocket" \
-		EXTRA_DEFINES="-DUSE_LIBWRAP=1" \
+		EXTRA_DEFINES="-DUSE_LIBWRAP=1 $(CFLAGS)" \
 		LOCAL_LDFLAGS="-L/opt/csw/lib" \
 		EXTRA_INCLUDES="-I/opt/csw/include" \
 		$(MAKE))

Modified: csw/mgar/pkg/tightvnc/trunk/checksums
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/checksums	2009-11-16 15:45:49 UTC (rev 7311)
+++ csw/mgar/pkg/tightvnc/trunk/checksums	2009-11-16 15:46:30 UTC (rev 7312)
@@ -1,7 +1,7 @@
 38a4eaded4a6418f5547fa57cefb97f9  0001-Force-the-use-of-libwrap.patch
 76166d097bf2e70627cb6c87d312bca5  0001-Sun-compiler-in-sun.cf.patch
-1264014c1ce47a119a724f17a6e0a768  0003-GNU-make-by-default.patch
+1264014c1ce47a119a724f17a6e0a768  0002-GNU-make-by-default.patch
 c5e9c3e4017caa65d14a0b98858043b9  0003-libdix.a-after-libos.a.patch
-20c9ead98ffb7b739fdb63429c3bac85  cswvncserver
+691ddda52a4bcbc14ee1c19f77e465a1  cswvncserver
 397b35faad32d5246b6d44b142f8304f  tightvnc-1.3.10_unixsrc.tar.bz2
 56c09be17c17184e96193c13246fd649  vncservers

Copied: csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch (from rev 7270, csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch)
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch	                        (rev 0)
+++ csw/mgar/pkg/tightvnc/trunk/files/0002-GNU-make-by-default.patch	2009-11-16 15:46:30 UTC (rev 7312)
@@ -0,0 +1,25 @@
+From 3e9ba23cbf15392e04b1d06e57575027a88a16c3 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 7 Sep 2009 10:09:47 +0200
+Subject: [PATCH 3/3] GNU make by default
+
+---
+ Xvnc/config/cf/svr4.cf |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xvnc/config/cf/svr4.cf b/Xvnc/config/cf/svr4.cf
+index b9fbcfc..2d7d3ab 100644
+--- a/Xvnc/config/cf/svr4.cf
++++ b/Xvnc/config/cf/svr4.cf
+@@ -74,7 +74,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $
+ #define	LexCmd	/usr/ccs/bin/lex
+ #endif
+ #ifndef MakeCmd
+-#define	MakeCmd	/usr/ccs/bin/make
++#define	MakeCmd	/opt/csw/bin/gmake
+ #endif
+ #ifndef YaccCmd
+ #define	YaccCmd	/usr/ccs/bin/yacc
+-- 
+1.6.3.2
+

Deleted: csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch
===================================================================
--- csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch	2009-11-16 15:45:49 UTC (rev 7311)
+++ csw/mgar/pkg/tightvnc/trunk/files/0003-GNU-make-by-default.patch	2009-11-16 15:46:30 UTC (rev 7312)
@@ -1,25 +0,0 @@
-From 3e9ba23cbf15392e04b1d06e57575027a88a16c3 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 7 Sep 2009 10:09:47 +0200
-Subject: [PATCH 3/3] GNU make by default
-
----
- Xvnc/config/cf/svr4.cf |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Xvnc/config/cf/svr4.cf b/Xvnc/config/cf/svr4.cf
-index b9fbcfc..2d7d3ab 100644
---- a/Xvnc/config/cf/svr4.cf
-+++ b/Xvnc/config/cf/svr4.cf
-@@ -74,7 +74,7 @@ XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $
- #define	LexCmd	/usr/ccs/bin/lex
- #endif
- #ifndef MakeCmd
--#define	MakeCmd	/usr/ccs/bin/make
-+#define	MakeCmd	/opt/csw/bin/gmake
- #endif
- #ifndef YaccCmd
- #define	YaccCmd	/usr/ccs/bin/yacc
--- 
-1.6.3.2
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.