Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libsodium/darts-clone] remove conflicting makefile #6875

Merged
merged 3 commits into from
Jun 13, 2019
Merged

[libsodium/darts-clone] remove conflicting makefile #6875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b5af6a
[libsodium/darts-clone] remove conflicting makefile
Rastaban Jun 12, 2019
b8cb565
[libsodium] bump control version
Rastaban Jun 12, 2019
30b1407
[darts-clone] update CONTROL version
Rastaban Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/darts-clone/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: darts-clone
Version: 1767ab87cffe
Version: 1767ab87cffe-1
Description: A static double-array trie structure
2 changes: 2 additions & 0 deletions ports/darts-clone/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()

file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)

file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright)
2 changes: 1 addition & 1 deletion ports/libsodium/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: libsodium
Version: 1.0.17-2
Version: 1.0.17-3
Description: A modern and easy-to-use crypto library
2 changes: 2 additions & 0 deletions ports/libsodium/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
)

file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)

if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string(
${CURRENT_PACKAGES_DIR}/include/sodium/export.h
Expand Down