From d42ea53e1454b381f6df7431e90e9ec53c4dbe2f Mon Sep 17 00:00:00 2001 From: Lubos Dolezel Date: Tue, 26 Jan 2016 20:25:26 +0100 Subject: [PATCH] libiconv crash fix --- src/libiconv/CMakeLists.txt | 2 +- src/libiconv/config.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libiconv/CMakeLists.txt b/src/libiconv/CMakeLists.txt index 66150cd8b..ec5ccb15a 100644 --- a/src/libiconv/CMakeLists.txt +++ b/src/libiconv/CMakeLists.txt @@ -20,7 +20,7 @@ add_definitions(-DHAVE_STDINT_H=1) add_definitions(-D__APPLE__ -D__DYNAMIC__) add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w -include ${CMAKE_CURRENT_BINARY_DIR}/include.h") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w -include ${CMAKE_CURRENT_BINARY_DIR}/include.h -O0 -ggdb") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,--version-script=${DARLING_TOP_DIRECTORY}/darwin.map") SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling") diff --git a/src/libiconv/config.h b/src/libiconv/config.h index 7418dc551..46b9f0df8 100644 --- a/src/libiconv/config.h +++ b/src/libiconv/config.h @@ -1,3 +1,4 @@ #define ENABLE_EXTRA 1 #define ENABLE_RELOCATABLE 1 #define HAVE_UNISTD_H 1 +#define HAVE_LANGINFO_CODESET 1 -- 2.51.2