(file) Return to config-linux.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config-linux.mak between version 1.58 and 1.64

version 1.58, 2008/06/05 17:33:02 version 1.64, 2013/01/07 12:39:37
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; VERITAS Software Corporation; The Open Group.  
 #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; Symantec Corporation; The Open Group.  
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy  #// Permission is hereby granted, free of charge, to any person obtaining a
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//==============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 # Configuration options for Pegasus on all architectures running Linux # Configuration options for Pegasus on all architectures running Linux
   # These options are also used by clang( which was designed as dropin
   # replacement for gcc). So some of the names are misleading like
   # PEGASUS_PLATFORM_LINUX_GENERIC_GNU due to GNU appended, Better will
   # be PEGASUS_PLATFORM_LINUX_GENERIC and GNU and CLANG can add it.
   # Changing this now(for 9236) will involve lot of work, Will take up
   # this work later.
   
  
 include $(ROOT)/mak/config-unix.mak include $(ROOT)/mak/config-unix.mak
  
Line 61 
Line 66 
  
 OS = linux OS = linux
  
 COMPILER = gnu  
   
 PLATFORM_VERSION_SUPPORTED = yes  
  
   ifeq ($(findstring _CLANG, $(PEGASUS_PLATFORM)), _CLANG)
       COMPILER = clang
       CXX = clang++
       CC = clang
   else
       COMPILER = gnu
 ifndef CXX ifndef CXX
 CXX = g++ CXX = g++
 endif endif
   endif
  
 SH = sh  PLATFORM_VERSION_SUPPORTED = yes
   
 YACC = bison  
   
 RM = rm -f  
   
 DIFF = diff  
   
 SORT = sort  
  
 COPY = cp  
  
 MOVE = mv  SH = sh
  
 MKDIRHIER = mkdir -p  YACC = bison
  
 PEGASUS_SUPPORTS_DYNLIB = yes PEGASUS_SUPPORTS_DYNLIB = yes
  
Line 95 
Line 95 
  
 SYS_LIBS = -ldl -lpthread -lcrypt SYS_LIBS = -ldl -lpthread -lcrypt
  
 FLAGS += -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT  ifeq ($(COMPILER), clang)
       FLAGS += -W -Wall -Wno-unused-parameter  -Wno-unused-value -D_GNU_SOURCE \
           -DTHREAD_SAFE -D_REENTRANT -Wno-unused-function -Werror=unused-variable
   else
       FLAGS += -W -Werror -Wall -Wno-unused -Wunused-variable -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
   endif
 ##============================================================================== ##==============================================================================
 ## ##
 ## The DYNAMIC_FLAGS variable defines linker flags that only apply to shared ## The DYNAMIC_FLAGS variable defines linker flags that only apply to shared
Line 113 
Line 117 
   # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably   # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
   # appeared in the 3.0 series of compilers.   # appeared in the 3.0 series of compilers.
   #   #
     ifeq ($(COMPILER), gnu)
   ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)   ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
     EXTRA_CXX_FLAGS += -fno-enforce-eh-specs     EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
   endif   endif
     else
             EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
     endif
   
   ifdef PEGASUS_OPTIMIZE_FOR_SIZE   ifdef PEGASUS_OPTIMIZE_FOR_SIZE
     FLAGS += -Os     FLAGS += -Os
   else   else
Line 142 
Line 151 
 ## ##
 ##============================================================================== ##==============================================================================
  
   ifeq ($(COMPILER), gnu)
 ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1) ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1)
     FLAGS += -fvisibility=hidden     FLAGS += -fvisibility=hidden
 endif endif
   else
       FLAGS +=-fvisibility=hidden
   endif
  
 ifndef PEGASUS_ARCH_LIB ifndef PEGASUS_ARCH_LIB
     ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)     ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)
         PEGASUS_ARCH_LIB = lib64         PEGASUS_ARCH_LIB = lib64
     else  
         PEGASUS_ARCH_LIB = lib  
     endif     endif
       ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_CLANG)
           PEGASUS_ARCH_LIB = lib64
       endif
       PEGASUS_ARCH_LIB = lib
 endif endif
 DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\" DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.64
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2