Merge pull request #1066 from codicodi/bzip2-dbg-suffix

[bzip2] add debug suffix

ports/boost/CONTROL

@@ -1,4 +1,4 @@
 Source: boost
-Version: 1.64-2
+Version: 1.64-3
 Description: Peer-reviewed portable C++ source libraries
 Build-Depends: zlib, bzip2

ports/boost/portfile.cmake

@@ -168,7 +168,7 @@ set(B2_OPTIONS_DBG
     ${B2_OPTIONS}
     -sZLIB_BINARY=zlibd
     -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-    -sBZIP2_BINARY=bz2
+    -sBZIP2_BINARY=bz2d
     -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
 )
 

ports/bzip2/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
-project(bzip2)
+project(bzip2 C)
 
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
     add_definitions(-DBZ_DEBUG) # enable extra assertions
@@ -15,7 +15,9 @@ set(LIBBZ2_SOURCES
     bzlib.c)
 
 add_library(libbz2 ${LIBBZ2_SOURCES})
-set_target_properties(libbz2 PROPERTIES ARCHIVE_OUTPUT_NAME bz2) # reqiured for FindBzip2 to work
+set_target_properties(libbz2 PROPERTIES
+    ARCHIVE_OUTPUT_NAME bz2 # required for FindBzip2 to work
+    DEBUG_POSTFIX d)
 if(BUILD_SHARED_LIBS)
     target_compile_definitions(libbz2 PRIVATE -DBZ_BUILD_DLL)
 endif()

ports/bzip2/CONTROL

@@ -1,3 +1,3 @@
 Source: bzip2
-Version: 1.0.6
+Version: 1.0.6-1
 Description: High-quality data compressor.

ports/bzip2/auto-define-import-macro.patch

@@ -1,13 +0,0 @@
-diff --git a/bzlib.h b/bzlib.h
-index e3ba1d6..d3bed44 100644
---- a/bzlib.h
-+++ b/bzlib.h
-@@ -26,6 +26,8 @@
- extern "C" {
- #endif
- 
-+#define BZ_IMPORT
-+
- #define BZ_RUN               0
- #define BZ_FLUSH             1
- #define BZ_FINISH            2

ports/bzip2/portfile.cmake

@@ -17,6 +17,7 @@ vcpkg_apply_patches(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS_DEBUG
         -DBZIP2_SKIP_HEADERS=ON
         -DBZIP2_SKIP_TOOLS=ON)
@@ -24,12 +25,14 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
-        PATCHES
-            ${CMAKE_CURRENT_LIST_DIR}/auto-define-import-macro.patch)
+file(READ ${CURRENT_PACKAGES_DIR}/include/bzlib.h BZLIB_H)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}")
+else()
+    string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}")
 endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}")
+
 
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)

ports/libarchive/CONTROL

@@ -1,4 +1,4 @@
 Source: libarchive
-Version: 3.3.1
+Version: 3.3.1-1
 Description: Library for reading and writing streaming archives
 Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl

ports/libarchive/fix-dependencies.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61c3b2a..c47b5b4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -783,7 +783,7 @@ main(int argc, char **argv)
+         IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
+           INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+ 	  LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
+-	   LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS)
++	   #LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS)
+         ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
+       ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
+       ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM})

ports/libarchive/portfile.cmake

@@ -15,7 +15,8 @@ vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch)
+        ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
+        ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}