[csw-devel] SF.net SVN: gar:[8248] csw/mgar/pkg/libfpx/trunk/Makefile

[hson at users.sourceforge.net]

Revision: 8248
          http://gar.svn.sourceforge.net/gar/?rev=8248&view=rev
Author:   hson
Date:     2010-01-31 05:24:10 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Fix for compilation problems on build farm when using Sun Studio which also
means no more need for gcc
Cleanup of Makefile

Package ready for release

Modified Paths:
--------------
    csw/mgar/pkg/libfpx/trunk/Makefile

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2010-01-31 03:45:21 UTC (rev 8247)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2010-01-31 05:24:10 UTC (rev 8248)
@@ -10,25 +10,18 @@
 MASTER_SITES = ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
 DISTFILES  = $(GARNAME)-$(GARVERSION)-$(GARSUBREV).tar.bz2
 
-#PACKAGES = CSWlibfpx CSWlibfpxdevel CSWlibfpxdoc
 PACKAGES = CSWlibfpx CSWlibfpxdevel
 CATALOGNAME_CSWlibfpx = libfpx
 CATALOGNAME_CSWlibfpxdevel = libfpx_devel
-#CATALOGNAME_CSWlibfpxdoc = libfpx_doc
 
 SPKG_DESC_CSWlibfpx += FlashPIX library
 SPKG_DESC_CSWlibfpxdevel += FlashPIX library - developer package
-#SPKG_DESC_CSWlibfpxdoc += FlashPIX library - documentation
 
 REQUIRED_PKGS_CSWlibfpx +=
 REQUIRED_PKGS_CSWlibfpxdevel += CSWlibfpx
-#REQUIRED_PKGS_CSWlibfpxdoc += CSWlibfpx
 
 PKGFILES_CSWlibfpxdevel = $(PKGFILES_DEVEL)
-#PKGFILES_CSWlibfpxdoc = $(sharedstatedir)/doc/.*
 
-#ARCHALL_CSWlibfpxdoc = 1
-
 SPKG_SOURCEURL = http://www.imagemagick.org
 
 PATCHFILES = olecomm.h.patch
@@ -40,6 +33,9 @@
 
 UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)-(\d+)?).tar.bz2
 
+# Fix for problem introduced between 12101[7-8]-17 and 12101[7-8]-20
+CXXFLAGS += -D_RWSTD_NO_WSTR=1
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 STRIP_LIBTOOL=1
@@ -48,7 +44,4 @@
 
 BUILD64 = 1
 
-# libfpx have some problems with rw/trait
-#GARCOMPILER = GCC4
-
 include gar/category.mk


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