aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2020-08-13 22:22:54 +0200
committerGitHub <noreply@github.com>2020-08-13 13:22:54 -0700
commit3ee1283aef870a296e87f20f65385c38e2777778 (patch)
treec8acd6a355383f459ce50eb2e33e957594feb61b
parentc771e7bd07c3137d43cdca96efcb954439133532 (diff)
downloadvcpkg-3ee1283aef870a296e87f20f65385c38e2777778.tar.gz
vcpkg-3ee1283aef870a296e87f20f65385c38e2777778.zip
[bzip2] fixes for building release-only (#12880)
* [bzip2] fixes for building release-only * [vcpkg_fixup_pkgconfig] fix spacing in messages * Update ports/bzip2/portfile.cmake Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Update portfile.cmake * back out changes to vcpkg_fixup_pkgconfig Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: wangli28 <wangli28@beyondsoft.com>
-rw-r--r--ports/bzip2/CONTROL9
-rw-r--r--ports/bzip2/portfile.cmake103
2 files changed, 57 insertions, 55 deletions
diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL
index 4734c4171..bdc70fcf4 100644
--- a/ports/bzip2/CONTROL
+++ b/ports/bzip2/CONTROL
@@ -1,4 +1,5 @@
-Source: bzip2
-Version: 1.0.6-6
-Homepage: http://www.bzip.org/
-Description: High-quality data compressor.
+Source: bzip2
+Version: 1.0.6
+Port-Version: 7
+Homepage: http://www.bzip.org/
+Description: High-quality data compressor.
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
index 571c84948..d6b70bacb 100644
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@@ -1,51 +1,52 @@
-include(vcpkg_common_functions)
-set(BZIP2_VERSION 1.0.6) # TODO: Update to 1.0.8
-vcpkg_download_distfile(ARCHIVE # TODO: switch to vcpkg_from_git with https://sourceware.org/git/?p=bzip2.git;a=summary
- URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz"
- FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
- SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
- REF ${BZIP2_VERSION}
- PATCHES
- fix-import-export-macros.patch
- fix-windows-include.patch
-)
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS_DEBUG
- -DBZIP2_SKIP_HEADERS=ON
- -DBZIP2_SKIP_TOOLS=ON
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-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")
-
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-
-vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE)
-
-set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")
-set(bzname bz2)
-configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)
-set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
-set(bzname bz2d)
-configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)
-vcpkg_fixup_pkgconfig() \ No newline at end of file
+set(BZIP2_VERSION 1.0.6) # TODO: Update to 1.0.8
+vcpkg_download_distfile(ARCHIVE # TODO: switch to vcpkg_from_git with https://sourceware.org/git/?p=bzip2.git;a=summary
+ URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz"
+ FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
+ SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF ${BZIP2_VERSION}
+ PATCHES
+ fix-import-export-macros.patch
+ fix-windows-include.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS_DEBUG
+ -DBZIP2_SKIP_HEADERS=ON
+ -DBZIP2_SKIP_TOOLS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+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}")
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")
+ set(bzname bz2)
+ configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)
+endif()
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
+ set(bzname bz2d)
+ configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)
+endif()
+
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")