pegasus/mak/config-linux.mak - diff

Return to config-linux.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config-linux.mak between version 1.51 and 1.63

version 1.51, 2006/07/11 18:41:11

version 1.63, 2012/12/11 11:10:31

Line 1

#//%2006////////////////////////////////////////////////////////////////////////

#//%LICENSE////////////////////////////////////////////////////////////////

#//

#// 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

#// 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

#// Source License; you may not use this file except in compliance with the

#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

#// License.

#// EMC Corporation; VERITAS Software Corporation; The Open Group.

#// 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

# 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

Line 61

Line 66

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

CXX = g++

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

Line 93

DEFINES += -DPEGASUS_USE_SYSLOGS

DEFINES += -DPEGASUS_HAS_SIGNALS

SYS_LIBS = -ldl -lpthread -lcrypt

# PAM support

ifeq ($(COMPILER), clang)

ifdef PEGASUS_PAM_AUTHENTICATION

FLAGS += -W -Wall -Wno-unused-parameter -Wno-unused-value -D_GNU_SOURCE \

ifeq ($(HPUX_IA64_VERSION), yes)

-DTHREAD_SAFE -D_REENTRANT -Wno-unused-function -Werror=unused-variable

SYS_LIBS += -L$(PAMLIB_HOME) -lpam

else

SYS_LIBS += -lpam

endif

## The following flags need to be set or unset

## to compile-in the code required for PAM authentication

## and compile-out the code that uses the password file.

DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE

endif

FLAGS += -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT

endif

##==============================================================================

## The DYNAMIC_FLAGS variable defines linker flags that only apply to shared

Line 131

Line 117

# The -fno-enforce-eh-specs is not available in 2.9.5 and it probably

# appeared in the 3.0 series of compilers.

ifeq ($(COMPILER), gnu)

ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)

EXTRA_CXX_FLAGS += -fno-enforce-eh-specs

endif

else

EXTRA_CXX_FLAGS += -fno-enforce-eh-specs

endif

ifdef PEGASUS_OPTIMIZE_FOR_SIZE

FLAGS += -Os

else

Line 153

Line 144

PEGASUS_HAS_MAKEDEPEND = yes

endif

# l10n

ifdef PEGASUS_HAS_MESSAGES

DEFINES += -DPEGASUS_HAS_MESSAGES

ifdef ICU_ROOT

MSG_COMPILE = genrb

MSG_FLAGS =

MSG_SOURCE_EXT = .txt

MSG_COMPILE_EXT = .res

CNV_ROOT_CMD = cnv2rootbundle

##################################

## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle,

## default is to uppercase the root resource bundle##

##################################

ifdef ICU_NO_UPPERCASE_ROOT

CNV_ROOT_FLAGS =

else

CNV_ROOT_FLAGS = -u

endif

####################################

## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource bundle will be generated from

## defaults to _en if not set. if set, for any directory containing resource bundles,

## there must exist a file name: package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages target will fail

####################################

ifdef ICU_ROOT_BUNDLE_LANG

MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)

else

MSG_ROOT_SOURCE = _en

endif

SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n

DEFINES += -DPEGASUS_HAS_ICU

EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata

endif

####################################

## If PEGASUS_LSB is set, set the rest of the variables.

####################################

ifdef PEGASUS_LSB

SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/

FLAGS += -DPEGASUS_OS_LSB

endif

##==============================================================================

## Set the default visibility symbol to hidden for shared libraries. This

Line 213

Line 151

##==============================================================================

ifeq ($(COMPILER), gnu)

ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1)

FLAGS += -fvisibility=hidden

endif

else

FLAGS +=-fvisibility=hidden

endif

ifndef PEGASUS_ARCH_LIB

ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)

PEGASUS_ARCH_LIB = lib64

else

PEGASUS_ARCH_LIB = lib

endif

ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_CLANG)

PEGASUS_ARCH_LIB = lib64

endif

PEGASUS_ARCH_LIB = lib

endif

DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"

Legend:

Removed from v.1.51
changed lines
	Added in v.1.63

No CVS admin address has been configured