Import of pkgsrc-2014Q1
This commit is contained in:
@@ -0,0 +1,18 @@
|
||||
$NetBSD: patch-CMakeLists.txt,v 1.2 2013/09/11 12:22:33 joerg Exp $
|
||||
|
||||
--- CMakeLists.txt.orig 2013-09-11 10:45:29.000000000 +0000
|
||||
+++ CMakeLists.txt
|
||||
@@ -70,11 +70,13 @@ include(SociDependencies)
|
||||
# Installation
|
||||
###############################################################################
|
||||
|
||||
+if(NOT DEFINED SOCI_LIBDIR)
|
||||
if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
set(SOCI_LIBDIR "lib")
|
||||
else()
|
||||
set(SOCI_LIBDIR "lib64")
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
|
||||
set(LIBDIR ${SOCI_LIBDIR} CACHE PATH "The directory to install libraries into.")
|
||||
@@ -0,0 +1,13 @@
|
||||
$NetBSD: patch-backends_postgresql_statement.cpp,v 1.1 2013/10/04 18:32:07 joerg Exp $
|
||||
|
||||
--- backends/postgresql/statement.cpp.orig 2013-10-02 07:33:45.455669800 +0000
|
||||
+++ backends/postgresql/statement.cpp
|
||||
@@ -453,7 +453,7 @@ long long postgresql_statement_backend::
|
||||
// pointer to it, so we can't rely on implicit conversion here.
|
||||
const char * const resultStr = PQcmdTuples(result_.get_result());
|
||||
char * end;
|
||||
- long long result = std::strtoll(resultStr, &end, 0);
|
||||
+ long long result = strtoll(resultStr, &end, 0);
|
||||
if (end != resultStr)
|
||||
{
|
||||
return result;
|
||||
@@ -0,0 +1,25 @@
|
||||
$NetBSD: patch-cmake_SociConfig.cmake,v 1.1 2013/10/04 18:32:07 joerg Exp $
|
||||
|
||||
--- cmake/SociConfig.cmake.orig 2013-08-21 22:40:11.000000000 +0000
|
||||
+++ cmake/SociConfig.cmake
|
||||
@@ -28,19 +28,11 @@ if (MSVC)
|
||||
|
||||
else()
|
||||
|
||||
- set(SOCI_GCC_CLANG_COMMON_FLAGS
|
||||
- "-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
|
||||
+ set(SOCI_GCC_CLANG_COMMON_FLAGS "-Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS}")
|
||||
- if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
- if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
|
||||
- else()
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
|
||||
- endif()
|
||||
- endif()
|
||||
|
||||
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
|
||||
|
||||
Reference in New Issue
Block a user