(file) Return to tog-pegasus.spec CVS log (file) (dir) Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/tog-pegasus.spec between version 1.135 and 1.136

version 1.135, 2012/10/04 19:03:56 version 1.136, 2013/05/07 09:06:04
Line 64 
Line 64 
 # providers for 64 bit CIMOM. # providers for 64 bit CIMOM.
 %{?!PEGASUS_32BIT_PROVIDER_SUPPORT: %define PEGASUS_32BIT_PROVIDER_SUPPORT 0} %{?!PEGASUS_32BIT_PROVIDER_SUPPORT: %define PEGASUS_32BIT_PROVIDER_SUPPORT 0}
  
   # Use "rpmbuild --define 'PEGASUS_BUILD_WITH_CLANG 1'" to build rpm with clang.
   # This shrinks disk usage by around 4%
   %{?!PEGASUS_BUILD_WITH_CLANG: %define PEGASUS_BUILD_WITH_CLANG 0}
   
 Summary:   OpenPegasus WBEM Services for Linux Summary:   OpenPegasus WBEM Services for Linux
 Name:      %{Flavor}-pegasus Name:      %{Flavor}-pegasus
 Group:     Systems Management/Base Group:     Systems Management/Base
Line 80 
Line 84 
 BuildRequires:      bash, sed, grep, coreutils, procps, gcc, gcc-c++ BuildRequires:      bash, sed, grep, coreutils, procps, gcc, gcc-c++
 BuildRequires:      libstdc++, make, pam-devel BuildRequires:      libstdc++, make, pam-devel
 BuildRequires:      openssl-devel >= 0.9.6, e2fsprogs BuildRequires:      openssl-devel >= 0.9.6, e2fsprogs
   
   #Following is commented because, Currently could not find clang shipped
   #Should be changed or uncommented when distros ship clang
   #and expects that system has clang 3 and above installed by other means
   #%if %{PEGASUS_BUILD_WITH_CLANG}
   #BuildRequires:      clang
   #%endif
   
 %if %{JMPI_PROVIDER_REQUESTED} %if %{JMPI_PROVIDER_REQUESTED}
 BuildRequires:      gcc-java, libgcj-devel, libgcj, java-1.4.2-gcj-compat BuildRequires:      gcc-java, libgcj-devel, libgcj, java-1.4.2-gcj-compat
 Requires:           libgcj, java-1.4.2-gcj-compat Requires:           libgcj, java-1.4.2-gcj-compat
Line 132 
Line 144 
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU
 %else %else
 %ifarch x86_64 %ifarch x86_64
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_CLANG
   %else
 %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU
   %endif
 %else %else
 %ifarch ppc %ifarch ppc
 %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU
Line 146 
Line 162 
 %ifarch s390x zseries %ifarch s390x zseries
 %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
 %else %else
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_CLANG
   %else
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
 %endif %endif
 %endif %endif
Line 153 
Line 172 
 %endif %endif
 %endif %endif
 %endif %endif
   %endif
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
  
Line 162 
Line 182 
 %if %{PEGASUS_32BIT_PROVIDER_SUPPORT} %if %{PEGASUS_32BIT_PROVIDER_SUPPORT}
  
 %ifarch x86_64 %ifarch x86_64
   
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_CLANG
   %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -fexceptions -fstack-protector -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   % global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -fexceptions -fstack-protector -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   %else
 %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_GNU %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_GNU
 %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -Wno-unused -m32" %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -Wno-unused -m32"
 %global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32" %global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   %endif
 %else %else
 %ifarch ppc64 pseries %ifarch ppc64 pseries
 %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_PPC_GNU %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_PPC_GNU

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