Differential D8859 Diff 23178 android/3rdparty/cfitsio.patch

Changeset View

Standalone View

View Options

android/3rdparty/cfitsio.patch

1--- CMakeLists.txt.orig 2017-05-20 13:30:52.859404414 +0300 1​diff --git a/CMakeLists.txt b/CMakeLists.txt
2+++ CMakeLists.txt 2017-05-20 13:28:38.682343341 +0300 2​index c749abb..2f259a2 100644
3@@ -1,6 +1,6 @@ 3​--- a/CMakeLists.txt
4 PROJECT(CFITSIO) 4​+++ b/CMakeLists.txt
5 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0) 5​@@ -64,6 +64,10 @@ install(FILES ${H_FILES} DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
6- ​
7+include(${CMAKE_TOOLCHAIN_FILE}) ​
8 # Allow the developer to select if Dynamic or Static libraries are built ​
9 OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON) ​
10 OPTION (USE_PTHREADS "Thread-safe build (using pthreads)" OFF) ​
11@@ -59,8 +59,8 @@ ​
12 ) ​
13 ​
14 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION}) ​
15-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${LIB_DESTINATION}) ​
16-install(FILES ${H_FILES} DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) ​
17+#install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${LIB_DESTINATION}) ​
18+#install(FILES ${H_FILES} DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) ​
19 6​
20 ENABLE_TESTING() 7​ ENABLE_TESTING()
21 8​
22--- fitscore.c.orig 2017-05-20 13:33:54.887384468 +0300 9​+IF(${CMAKE_TOOLCHAIN_FILE} MATCHES ".*toolchain-android.cmake")
23+++ fitscore.c 2017-05-20 13:08:19.014783064 +0300 10​+ include(${CMAKE_TOOLCHAIN_FILE})
24@@ -9230,7 +9230,7 @@ 11​+ENDIF()
12​+
13​ ADD_EXECUTABLE(TestProg testprog.c)
14​ TARGET_LINK_LIBRARIES(TestProg ${LIB_NAME})
15​ ADD_TEST(TestProg TestProg)
16​diff --git a/fitscore.c b/fitscore.c
17​index 4c90df0..5e59cc1 100644
18​--- a/fitscore.c
19​+++ b/fitscore.c
20​@@ -9230,7 +9230,7 @@ int ffc2rr(const char *cval, /* I - string representation of the value */
25 21​
26 if (!decimalpt) { /* only do this once for efficiency */ 22​ if (!decimalpt) { /* only do this once for efficiency */
27 lcc = localeconv(); /* set structure containing local decimal point symbol */ 23​ lcc = localeconv(); /* set structure containing local decimal point symbol */
28- decimalpt = *(lcc->decimal_point); 24​- decimalpt = *(lcc->decimal_point);
29+// decimalpt = *(lcc->decimal_point); 25​+// decimalpt = *(lcc->decimal_point);
30 } 26​ }
31 27​
32 errno = 0; 28​ errno = 0;
33@@ -9300,7 +9300,7 @@ 29​@@ -9300,7 +9300,7 @@ int ffc2dd(const char *cval, /* I - string representation of the value */
34 30​
35 if (!decimalpt) { /* only do this once for efficiency */ 31​ if (!decimalpt) { /* only do this once for efficiency */
36 lcc = localeconv(); /* set structure containing local decimal point symbol */ 32​ lcc = localeconv(); /* set structure containing local decimal point symbol */
37- decimalpt = *(lcc->decimal_point); 33​- decimalpt = *(lcc->decimal_point);
38+// decimalpt = *(lcc->decimal_point); 34​+// decimalpt = *(lcc->decimal_point);
39 } 35​ }
40 36​
41 errno = 0; 37​ errno = 0;