[csw-devel] SF.net SVN: gar:[3797] csw/mgar/gar/v2/categories/x11/category.mk

[wbonnet at users.sourceforge.net]

Revision: 3797
          http://gar.svn.sourceforge.net/gar/?rev=3797&view=rev
Author:   wbonnet
Date:     2009-03-17 23:44:18 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Fix bugs :

https://sourceforge.net/tracker2/?func=detail&aid=2682000&group_id=229205&atid=1075770

  CONFIGURE_ARGS should not contains $(DIRPATHS)
  libdir is wrong (/opt/csw/X11 instead of /opt/csw/X11/lib)
  
https://sourceforge.net/tracker2/?func=detail&aid=2681997&group_id=229205&atid=1075770

  Compiler options are invalid for GCC
  

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/x11/category.mk

Modified: csw/mgar/gar/v2/categories/x11/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/x11/category.mk	2009-03-17 22:08:52 UTC (rev 3796)
+++ csw/mgar/gar/v2/categories/x11/category.mk	2009-03-17 23:44:18 UTC (rev 3797)
@@ -2,12 +2,15 @@
 X11_PROTO_MASTER_SITE = http://xorg.freedesktop.org/releases/individual/proto/
 XCB_MASTER_SITES = http://xcb.freedesktop.org/dist/
 
-# C compiler flags
-CFLAGS       += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
+# C and C++ compiler flags
+ifeq ($(GARCOMPILER),GNU)
+  CFLAGS +=
+  CXXFLAGS +=
+else
+  CFLAGS += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
+  CXXFLAGS += -xlibmil -xlibmopt -features=tmplife -norunpath
+endif
 
-# C++ compiler flags
-CXXFLAGS     += -xlibmil -xlibmopt -features=tmplife -norunpath
-
 # Preprocessor flags
 
 # Linker flags
@@ -24,10 +27,9 @@
 PKG_CONFIG_PATH += $(DESTDIR)/opt/csw/X11/lib/pkgconfig
 
 # Configure common options
-CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --prefix=/opt/csw/X11 
+CONFIGURE_ARGS  = --prefix=/opt/csw/X11 
 CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 
-CONFIGURE_ARGS += --libdir=/opt/csw/X11 
+CONFIGURE_ARGS += --libdir=/opt/csw/X11/lib
 CONFIGURE_ARGS += --includedir=/opt/csw/X11/include
 CONFIGURE_ARGS += --datadir=/opt/csw/X11/share
 CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man


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