diff --git a/portage/win32libs/libcurl/curl-7.28.1-20130202.diff b/portage/win32libs/libcurl/curl-7.28.1-20130202.diff new file mode 100644 index 000000000..19d3b9677 --- /dev/null +++ b/portage/win32libs/libcurl/curl-7.28.1-20130202.diff @@ -0,0 +1,41 @@ +diff -Nru -x '*~' curl-7.28.1.orig/CMakeLists.txt curl-7.28.1/CMakeLists.txt +--- curl-7.28.1.orig/CMakeLists.txt 2012-04-25 17:29:20.000000000 +0200 ++++ curl-7.28.1/CMakeLists.txt 2013-02-02 00:32:05.523855100 +0100 +@@ -227,8 +227,10 @@ + # Check for idn + check_library_exists_concat("idn" idna_to_ascii_lz HAVE_LIBIDN) + ++if(NOT CURL_LDAP_WIN) + # Check for LDAP + check_library_exists_concat("ldap" ldap_init HAVE_LIBLDAP) ++endif() + # if(NOT HAVE_LIBLDAP) + # SET(CURL_DISABLE_LDAP ON) + # endif(NOT HAVE_LIBLDAP) +@@ -261,6 +263,7 @@ + set(USE_SSLEAY TRUE) + set(USE_OPENSSL TRUE) + list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES} ) ++ list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS}) + else() + set(CMAKE_USE_OPENSSL FALSE) + message(STATUS "OpenSSL NOT Found, disabling CMAKE_USE_OPENSSL") +@@ -293,6 +296,7 @@ + if(NOT UNIX) + check_include_file_concat("windows.h" HAVE_WINDOWS_H) + check_include_file_concat("winsock.h" HAVE_WINSOCK_H) ++ check_include_file_concat("winldap.h" HAVE_WINLDAP_H) + endif(NOT UNIX) + + check_include_file_concat("inttypes.h" HAVE_INTTYPES_H) +@@ -381,8 +385,8 @@ + check_include_file_concat("openssl/rand.h" HAVE_OPENSSL_RAND_H) + endif(CMAKE_USE_OPENSSL) + +-if(NOT HAVE_LDAP_H) +- message(STATUS "LDAP_H not found CURL_DISABLE_LDAP set ON") ++if(NOT HAVE_LDAP_H AND NOT HAVE_WINLDAP_H) ++ message(STATUS "Neither LDAP_H nor WINLDAP_H found CURL_DISABLE_LDAP set ON") + set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) + endif() + diff --git a/portage/win32libs/libcurl/curl-7.28.1-installlocation.diff b/portage/win32libs/libcurl/curl-7.28.1-installlocation.diff new file mode 100644 index 000000000..60cae150e --- /dev/null +++ b/portage/win32libs/libcurl/curl-7.28.1-installlocation.diff @@ -0,0 +1,31 @@ +diff -Nru -x '*~' curl-7.28.1.orig/CMakeLists.txt curl-7.28.1/CMakeLists.txt +--- curl-7.28.1.orig/CMakeLists.txt 2013-02-02 00:57:04.198542900 +0100 ++++ curl-7.28.1/CMakeLists.txt 2013-02-02 00:56:47.073563400 +0100 +@@ -132,6 +132,16 @@ + option(ENABLE_IPV6 "Define if you want to enable IPv6 support" OFF) + mark_as_advanced(ENABLE_IPV6) + ++if(NOT CURL_RUNTIME_INSTALL_DESTINATION) ++ set(CURL_RUNTIME_INSTALL_DESTINATION lib) ++endif() ++if(NOT CURL_LIBRARY_INSTALL_DESTINATION) ++ set(CURL_LIBRARY_INSTALL_DESTINATION lib) ++endif() ++if(NOT CURL_ARCHIVE_INSTALL_DESTINATION) ++ set(CURL_ARCHIVE_INSTALL_DESTINATION lib) ++endif() ++ + if(WIN32) + # Windows standard libraries are located in C:/Program Files/Microsoft SDKs/[...] + # They are already included in the default MSVC LIBPATH => no find_library is needed! +diff -Nru -x '*~' curl-7.28.1.orig/lib/CMakeLists.txt curl-7.28.1/lib/CMakeLists.txt +--- curl-7.28.1.orig/lib/CMakeLists.txt 2011-11-04 23:32:55.000000000 +0100 ++++ curl-7.28.1/lib/CMakeLists.txt 2013-02-02 00:51:37.279851400 +0100 +@@ -123,4 +123,6 @@ + endif() + endif() + +-install(TARGETS ${LIB_NAME} DESTINATION lib) ++install(TARGETS ${LIB_NAME} RUNTIME DESTINATION ${CURL_RUNTIME_INSTALL_DESTINATION} ++ LIBRARY DESTINATION ${CURL_LIBRARY_INSTALL_DESTINATION} ++ ARCHIVE DESTINATION ${CURL_ARCHIVE_INSTALL_DESTINATION}) diff --git a/portage/win32libs/libcurl/libcurl-7.20.0.py b/portage/win32libs/libcurl/libcurl-7.20.0.py index f6920b799..30a212a83 100644 --- a/portage/win32libs/libcurl/libcurl-7.20.0.py +++ b/portage/win32libs/libcurl/libcurl-7.20.0.py @@ -1,42 +1,44 @@ # -*- coding: utf-8 -*- import info import utils from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): - for ver in [ '7.19.6' ,'7.20.0' ]: + for ver in [ '7.19.6' ,'7.20.0', '7.28.1' ]: self.targets[ver] = 'http://curl.haxx.se/download/curl-' + ver + '.tar.bz2' self.targetInstSrc[ver] = 'curl-' + ver self.patchToApply['7.20.0'] = ("7.20.0.diff", 1) + self.patchToApply['7.28.1'] = [("curl-7.28.1-20130202.diff", 1), ("curl-7.28.1-installlocation.diff", 1)] + self.targetDigests['7.28.1'] = 'b5aff1afc4e40fcb78db7a5e27214e0035756f3d' self.shortDescription = "a free and easy-to-use client-side URL transfer library" self.defaultTarget = '7.20.0' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = " -DBUILD_CURL_TESTS=OFF" def unpack(self): if not CMakePackageBase.unpack( self ): return False - if(self.subinfo.buildTarget in ['7.20.0']): + if(self.subinfo.buildTarget in ['7.20.0', '7.28.1']): return True # we have an own cmake script - copy it to the right place cmake_script = os.path.join( self.packageDir() , "CMakeLists.txt" ) cmake_dest = os.path.join( self.sourceDir() , "CMakeLists.txt" ) shutil.copy( cmake_script, cmake_dest ) return True if __name__ == '__main__': Package().execute()