rpms/kdelibs/F-11 kdelibs-4.2.3-strcasestr-glibc2.9.patch, NONE, 1.1 kdelibs.spec, 1.475, 1.476 kdelibs-4.2.0-gcc44-misc.patch, 1.1, NONE kdelibs-4.2.0-gcc44-workaround.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Mon May 4 21:37:54 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdelibs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6676
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.2.3-strcasestr-glibc2.9.patch
Removed Files:
kdelibs-4.2.0-gcc44-misc.patch
kdelibs-4.2.0-gcc44-workaround.patch
Log Message:
- better fix for strcasestr detection
kdelibs-4.2.3-strcasestr-glibc2.9.patch:
--- NEW FILE kdelibs-4.2.3-strcasestr-glibc2.9.patch ---
--- kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 0)
+++ kdelibs/cmake/modules/CheckCXXSymbolExists.cmake (Revision 963449)
@@ -0,0 +1,71 @@
+# - Check if the symbol exists in include files, in C++ mode
+# Forked off cmake's CheckSymbolExists.cmake
+# CHECK_CXX_SYMBOL_EXISTS(SYMBOL FILES VARIABLE)
+#
+# SYMBOL - symbol
+# FILES - include files to check
+# VARIABLE - variable to return result
+#
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+# CMAKE_REQUIRED_FLAGS = string of compile command line flags
+# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+# CMAKE_REQUIRED_INCLUDES = list of include directories
+# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+MACRO(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
+ IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
+ SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
+ SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
+ IF(CMAKE_REQUIRED_LIBRARIES)
+ SET(CHECK_SYMBOL_EXISTS_LIBS
+ "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+ ELSE(CMAKE_REQUIRED_LIBRARIES)
+ SET(CHECK_SYMBOL_EXISTS_LIBS)
+ ENDIF(CMAKE_REQUIRED_LIBRARIES)
+ IF(CMAKE_REQUIRED_INCLUDES)
+ SET(CMAKE_SYMBOL_EXISTS_INCLUDES
+ "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+ ELSE(CMAKE_REQUIRED_INCLUDES)
+ SET(CMAKE_SYMBOL_EXISTS_INCLUDES)
+ ENDIF(CMAKE_REQUIRED_INCLUDES)
+ FOREACH(FILE ${FILES})
+ SET(CMAKE_CONFIGURABLE_FILE_CONTENT
+ "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n")
+ ENDFOREACH(FILE)
+ SET(CMAKE_CONFIGURABLE_FILE_CONTENT
+ "${CMAKE_CONFIGURABLE_FILE_CONTENT}\nvoid cmakeRequireSymbol(int dummy,...){(void)dummy;}\nint main()\n{\n#ifndef ${SYMBOL}\n cmakeRequireSymbol(0,&${SYMBOL});\n#endif\n return 0;\n}\n")
+
+ CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
+ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" @ONLY)
+
+ MESSAGE(STATUS "Looking for ${SYMBOL}")
+ TRY_COMPILE(${VARIABLE}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx
+ COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+ CMAKE_FLAGS
+ -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS}
+ "${CHECK_SYMBOL_EXISTS_LIBS}"
+ "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
+ OUTPUT_VARIABLE OUTPUT)
+ IF(${VARIABLE})
+ MESSAGE(STATUS "Looking for ${SYMBOL} - found")
+ SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}")
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+ "Determining if the ${SYMBOL} "
+ "exist passed with the following output:\n"
+ "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n"
+ "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+ ELSE(${VARIABLE})
+ MESSAGE(STATUS "Looking for ${SYMBOL} - not found.")
+ SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
+ FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+ "Determining if the ${SYMBOL} "
+ "exist failed with the following output:\n"
+ "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n"
+ "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+ ENDIF(${VARIABLE})
+ ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
+ENDMACRO(CHECK_CXX_SYMBOL_EXISTS)
--- kdelibs/ConfigureChecks.cmake (Revision 963448)
+++ kdelibs/ConfigureChecks.cmake (Revision 963449)
@@ -6,6 +6,7 @@
include(CheckIncludeFile)
include(CheckIncludeFiles)
include(CheckSymbolExists)
+include(CheckCXXSymbolExists)
include(CheckFunctionExists)
include(CheckLibraryExists)
include(CheckPrototypeExists)
@@ -230,7 +231,15 @@
check_function_exists(random HAVE_RANDOM) # kdecore/fakes.c
check_function_exists(strlcpy HAVE_STRLCPY) # kdecore/fakes.c
check_function_exists(strlcat HAVE_STRLCAT) # kdecore/fakes.c
-check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c
+check_cxx_symbol_exists(__CORRECT_ISO_CPP_STRING_H_PROTO "string.h" HAVE_STRCASESTR_OVERLOAD) # glibc-2.9 strangeness
+if (HAVE_STRCASESTR_OVERLOAD)
+ message(STATUS "string.h defines __CORRECT_ISO_CPP_STRING_H_PROTO")
+ set(HAVE_STRCASESTR 1)
+ set(HAVE_STRCASESTR_PROTO 1)
+else()
+ check_function_exists(strcasestr HAVE_STRCASESTR) # kdecore/fakes.c
+ check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO)
+endif()
check_function_exists(setenv HAVE_SETENV) # kdecore/fakes.c
check_function_exists(seteuid HAVE_SETEUID) # kdecore/fakes.c
check_function_exists(setmntent HAVE_SETMNTENT) # solid, kio, kdecore
@@ -243,7 +252,6 @@
check_prototype_exists(mkdtemp "stdlib.h;unistd.h" HAVE_MKDTEMP_PROTO)
check_prototype_exists(mkstemp "stdlib.h;unistd.h" HAVE_MKSTEMP_PROTO)
check_prototype_exists(strlcat string.h HAVE_STRLCAT_PROTO)
-check_prototype_exists(strcasestr string.h HAVE_STRCASESTR_PROTO)
check_prototype_exists(strlcpy string.h HAVE_STRLCPY_PROTO)
check_prototype_exists(random stdlib.h HAVE_RANDOM_PROTO)
check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO)
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-11/kdelibs.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- kdelibs.spec 3 May 2009 21:56:18 -0000 1.475
+++ kdelibs.spec 4 May 2009 21:37:23 -0000 1.476
@@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -79,11 +79,10 @@ Patch14: kdelibs-4.0.85-libexecdir.patch
Patch18: kdelibs-4.1.72-kstandarddirs.patch
Patch20: kdelibs-4.1.70-cmake.patch
Patch22: kdelibs-4.1.96-cmake.patch
-Patch23: kdelibs-4.2.0-gcc44-workaround.patch
-Patch25: kdelibs-4.2.0-gcc44-misc.patch
# upstream
# 4.2 branch
+Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch
# 4.3 branch
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -217,11 +216,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{versi
%patch18 -p1 -b .kstandarddirs
%patch20 -p1 -b .xxcmake
%patch22 -p1 -b .kdepimlibs-cmake
-%patch23 -p1 -b .gcc44
-%patch25 -p1 -b .gcc44-misc
# upstream patches
# 4.2
+%patch100 -p1 -b .strcasestr-glibc2.9
# 4.3
%patch200 -p1 -b .AllowExternalPaths
@@ -407,6 +405,9 @@ rm -rf %{buildroot}
%changelog
+* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-2
+- better fix for strcasestr detection
+
* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
- 4.2.3
--- kdelibs-4.2.0-gcc44-misc.patch DELETED ---
--- kdelibs-4.2.0-gcc44-workaround.patch DELETED ---
More information about the scm-commits
mailing list