librhash: Update from 1.3.5 to 1.3.6
[termux-packages] / packages / apt / CMakeLists.txt.patch
CommitLineData
ee5e9ab1
FF
1diff -u -r ../apt-1.4.7/CMakeLists.txt ./CMakeLists.txt
2--- ../apt-1.4.7/CMakeLists.txt 2017-07-13 23:45:39.000000000 +0200
3+++ ./CMakeLists.txt 2017-07-23 23:24:06.877483680 +0200
4@@ -33,7 +33,6 @@
6ad26efe 5 include(GNUInstallDirs)
6 include(TestBigEndian)
7 find_package(Threads)
8-find_package(LFS REQUIRED)
6ad26efe 9 find_package(Iconv REQUIRED)
10
11 find_package(Perl REQUIRED)
ee5e9ab1
FF
12@@ -44,11 +43,6 @@
13 include_directories(${Intl_INCLUDE_DIRS})
6ad26efe 14 endif()
15
ee5e9ab1 16-# Add large file support
6ad26efe 17-add_compile_options(${LFS_COMPILE_OPTIONS})
18-add_definitions(${LFS_DEFINITIONS})
19-link_libraries(${LFS_LIBRARIES})
ee5e9ab1 20-
6ad26efe 21 # Set compiler flags
22 set(CMAKE_CXX_STANDARD 11)
ee5e9ab1
FF
23 set(CMAKE_CXX_STANDARD_REQUIRED ON)
24@@ -69,13 +63,6 @@
25 add_optional_compile_options(Wsign-promo)
26 add_optional_compile_options(Wundef)
27
28-# apt-ftparchive dependencies
29-find_package(BerkeleyDB REQUIRED)
30-if (BERKELEY_DB_FOUND)
31- set(HAVE_BDB 1)
32-endif()
33-
34-
35 # apt-transport-https dependencies
36 find_package(CURL REQUIRED)
37 if (CURL_FOUND)
38@@ -89,21 +76,12 @@
39 endif()
40
41
42-find_package(BZip2)
43-if (BZIP2_FOUND)
44- set(HAVE_BZ2 1)
45-endif()
46-
47 find_package(LZMA)
48 if (LZMA_FOUND)
49 set(HAVE_LZMA 1)
6ad26efe 50 endif()
51
52
53-find_package(LZ4)
54-if (LZ4_FOUND)
55- set(HAVE_LZ4 1)
56-endif()
57
58 # Mount()ing and stat()ing and friends
59 check_symbol_exists(statfs sys/vfs.h HAVE_VFS_H)
ee5e9ab1 60@@ -180,10 +158,10 @@
6ad26efe 61 message(STATUS "Found dpkg data dir: ${DPKG_DATADIR_CMD}")
62 set(DPKG_DATADIR "${DPKG_DATADIR_CMD}" CACHE PATH "dpkg data directory")
63 endif()
64-if (NOT DEFINED COMMON_ARCH)
65- execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH
66- OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
67-endif()
68+# if (NOT DEFINED COMMON_ARCH)
69+# execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH
70+ #OUTPUT_VARIABLE COMMON_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
71+# endif()
72 if (NOT DEFINED ROOT_GROUP)
73 execute_process(COMMAND id -gn root
74 OUTPUT_VARIABLE ROOT_GROUP OUTPUT_STRIP_TRAILING_WHITESPACE)
ee5e9ab1 75@@ -211,11 +189,8 @@
6ad26efe 76 add_subdirectory(apt-inst)
77 add_subdirectory(cmdline)
78 add_subdirectory(completions)
79-add_subdirectory(doc)
80 add_subdirectory(dselect)
ee5e9ab1 81-add_subdirectory(ftparchive)
6ad26efe 82 add_subdirectory(methods)
ee5e9ab1
FF
83-add_subdirectory(test)
84
85 if (USE_NLS)
86 add_subdirectory(po)