[vcpkg] Improve make builds (#10402)

* update all 16 configure_make ports * add make wrappers for msvc * improve make builds * fix relativ path errors on linux (and osx?) * revisit all 16 portfiles again * remove trace from install * fix relative build path issues. * bump control of the 16 configure ports * never forget .... real linux is case sensitive .... * Revert "bump control of the 16 configure ports" This reverts commit 40d6d81c01d2709c4acbdbec503b4787c3fd8282. * Revert "Revert "bump control of the 16 configure ports"" This reverts commit 9c9851ddfcd01bfad604ab9c9aed7379238d619a. * bump control again for real ci rebuild * add copy_source * remove message * pass parameters to vcpkg_build_make * fix healpix build. * fix libmagic regression * fix libwandio regression * pfring changes regression fix? (cannot test in wsl) * ws change to retrigger CI * fix libpq regression * fix libudns regression * add share/pkgconfig to PKG_CONFIG_PATH * cleanup of deprecated options * cleanup docs * Revert "bump control again for real ci rebuild" This reverts commit b4bc18edc2376eba6c3aa3dda52bd82286f23616. * shared binaries on linux should stay in lib. Only dlls are mvoed to bin * move pkgconfig check and add message about missing system packages * added autopoint as a build requirement * fix prerun shell working dir. * a few fixes from the x windows pr - add libpath setting - fixed pkgconfig search on windows platforms - fixed autopoint msys package on windows * fix release prefix * minimal cleanup and ws changes to trigger true CI rebuild * fix tcl by upgrading * remove unnecessary rename * fix pfring? can't test in WSL. Linux kernel headers required. * fix lowercase in patch * fix libwandio * remove x264 from fail list * replace wrappers with wrappers from automake * update make ports * remove unnecessary message * refactor vcpkg_configure_make * [tcl] remove stray ? * [farmhash] fix build * [freexl] ws change to retrigger ci build * [x264] add pthread as a dependency * [vcpkg/scripts] add ignore flag correctly * [sdl] fix vcpkg_fixup_pkgconfig call * [farmhash/freexl] delete configure and recreate it. * [libudns] remove trailing ? * [freexl] use empty build target * [freexl] add system library; remove previous change * Update ports/x264/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [libwandio] remove unncessary comment Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
author: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> 2020-05-21 19:46:07 +0200
committer: GitHub <noreply@github.com> 2020-05-21 10:46:07 -0700
commit: 27c6c9420277c533cc4333bdd880f9862012cb72 (patch)
tree: ffb9a979edc97e987ebca77590400e3577b93567 /ports
parent: f6dd5aee5b2ed144a8313a92290771947028e5b6 (diff)
download: vcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.tar.gz
vcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.zip
34 files changed, 328 insertions, 119 deletions
diff --git a/ports/farmhash/CONTROL b/ports/farmhash/CONTROL
index 79cb6849a..f27140fbd 100644
--- a/ports/farmhash/CONTROL
+++ b/ports/farmhash/CONTROL
@@ -1,4 +1,5 @@
 Source: farmhash
-Version: 1.1
+Version: 1.1-1
 Homepage: https://github.com/google/farmhash
 Description: FarmHash, a family of hash functions.
+Supports: !arm
diff --git a/ports/farmhash/portfile.cmake b/ports/farmhash/portfile.cmake
index 42aa80ceb..d9bcc9240 100644
--- a/ports/farmhash/portfile.cmake
+++ b/ports/farmhash/portfile.cmake
@@ -1,5 +1,5 @@
-vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "Windows")
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+#Requires a compiler which understands '__builtin_unreachable': 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY) 
 
 vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
@@ -9,12 +9,12 @@ vcpkg_from_github(
         HEAD_REF master
 )
 
-set(FLAGS "-g -mavx -maes -O3")
+if((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) AND NOT ENV{CXX_FLAGS}) # This should be a compiler check
+    set(ENV{CXXFLAGS} "-maes -msse4.2")
+endif()
+file(REMOVE_RECURSE "${SOURCE_PATH}/configure")
 vcpkg_configure_make(
         SOURCE_PATH ${SOURCE_PATH}
-        AUTOCONFIG
-        OPTIONS
-        CXXFLAGS=${FLAGS}
 )
 
 vcpkg_install_make()
diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL
index 23f6b3468..68d0d291f 100644
--- a/ports/freexl/CONTROL
+++ b/ports/freexl/CONTROL
@@ -1,5 +1,5 @@
 Source: freexl
-Version: 1.0.4-8
+Version: 1.0.4-9
 Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources
 Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet
 Build-Depends: libiconv
diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake
index 825378837..3c4629dce 100644
--- a/ports/freexl/portfile.cmake
+++ b/ports/freexl/portfile.cmake
@@ -1,4 +1,3 @@
-include(vcpkg_common_functions)
 set(FREEXL_VERSION_STR "1.0.4")
 
 vcpkg_download_distfile(ARCHIVE
@@ -36,8 +35,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
             INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}"
             INST_DIR="${CURRENT_PACKAGES_DIR}"
             "LINK_FLAGS="
-            "LIBS_ALL=${LIBS_ALL_REL}"
-        
+            "LIBS_ALL=${LIBS_ALL_REL}"       
     )
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
     file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freexl RENAME copyright)
@@ -64,7 +62,7 @@ elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX
         ARCHIVE ${ARCHIVE}
         OUT_SOURCE_PATH SOURCE_PATH
     )
-    
+    file(REMOVE_RECURSE "${SOURCE_PATH}/configure")
     vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG
@@ -80,6 +78,7 @@ elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX
     )
     
     vcpkg_install_make()
+    vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m)
     
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
     file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freexl RENAME copyright)
diff --git a/ports/healpix/CONTROL b/ports/healpix/CONTROL
index f29051305..1fa217b77 100644
--- a/ports/healpix/CONTROL
+++ b/ports/healpix/CONTROL
@@ -1,5 +1,5 @@
 Source: healpix
-Version: 1.12.10
+Version: 1.12.10-1
 Homepage: http://healpix.sourceforge.net/
 Description: HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere.
 Build-Depends: cfitsio
diff --git a/ports/healpix/portfile.cmake b/ports/healpix/portfile.cmake
index 5dbd9c3c2..2ecacc939 100644
--- a/ports/healpix/portfile.cmake
+++ b/ports/healpix/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(ON_TARGET "Windows" "OSX")
-
 set(HEALPIX_VER 3.50)
 set(HEALPIX_PACK_NAME  ${HEALPIX_VER}_2018Dec10)
 
@@ -17,25 +15,31 @@ vcpkg_extract_source_archive_ex(
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH src/cxx
-    AUTOCONFIG
-    NO_DEBUG
+    COPY_SOURCE
     OPTIONS
         --with-libcfitsio-include=${CURRENT_INSTALLED_DIR}/include/cfitsio
         --with-libcfitsio-lib=${CURRENT_INSTALLED_DIR}/lib
 )
 
-vcpkg_build_make()
+vcpkg_build_make(BUILD_TARGET compile_all)
+#vcpkg_fixup_pkgconfig()
 
-# Install manually
-set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/src/cxx/auto)
+# Install manually because healpix has no install target
+set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/auto")
 file(GLOB_RECURSE HEALPIX_LIBS ${OBJ_DIR}/lib/*)
-file(INSTALL ${HEALPIX_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${HEALPIX_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
 
 file(GLOB_RECURSE HEALPIX_INCLUDES ${OBJ_DIR}/include/*)
-file(INSTALL ${HEALPIX_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL ${HEALPIX_INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
 file(GLOB_RECURSE HEALPIX_TOOLS ${OBJ_DIR}/bin/*)
-file(INSTALL ${HEALPIX_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL ${HEALPIX_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/")
+    set(OBJ_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/auto")
+    file(GLOB_RECURSE HEALPIX_LIBS ${OBJ_DIR}/lib/*)
+    file(INSTALL ${HEALPIX_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+endif()
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libb2/CONTROL b/ports/libb2/CONTROL
index 0523b60d5..41fb105aa 100644
--- a/ports/libb2/CONTROL
+++ b/ports/libb2/CONTROL
@@ -1,4 +1,4 @@
 Source: libb2
-Version: 0.98.1
+Version: 0.98.1-1
 Homepage: https://github.com/BLAKE2/libb2
 Description: C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
 \ No newline at end of file
diff --git a/ports/libb2/portfile.cmake b/ports/libb2/portfile.cmake
index 88007bdf0..2a342f9dc 100644
--- a/ports/libb2/portfile.cmake
+++ b/ports/libb2/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BLAKE2/libb2
@@ -8,12 +6,18 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+set(OPTIONS)
+if(CMAKE_HOST_WIN32)
+    set(OPTIONS --disable-native) # requires cpuid
+endif()
+
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
-    AUTOCONFIG
+    OPTIONS ${OPTIONS}
 )
-
 vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
+
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/libcrafter/CONTROL b/ports/libcrafter/CONTROL
index 76c3c1bc2..b8ebac0bf 100644
--- a/ports/libcrafter/CONTROL
+++ b/ports/libcrafter/CONTROL
@@ -1,5 +1,5 @@
 Source: libcrafter
-Version: 0.3
+Version: 0.3-1
 Homepage: https://github.com/pellegre/libcrafter
 Description: Libcrafter is a high level library for C++ designed to create and decode network packets.
 Build-Depends: libpcap
 \ No newline at end of file
diff --git a/ports/libcrafter/portfile.cmake b/ports/libcrafter/portfile.cmake
index 57427906b..9965b7d3c 100644
--- a/ports/libcrafter/portfile.cmake
+++ b/ports/libcrafter/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platforms" ON_TARGET "Windows" "OSX")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pellegre/libcrafter
@@ -11,10 +9,9 @@ vcpkg_from_github(
 
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
-    AUTOCONFIG
     PROJECT_SUBPATH libcrafter
     OPTIONS
-        --with-libpcap=${CURRENT_INSTALLED_DIR}
+        "--with-libpcap=${CURRENT_INSTALLED_DIR}"
 )
 
 vcpkg_install_make()
diff --git a/ports/libmagic/CONTROL b/ports/libmagic/CONTROL
index 3f0b777eb..07fce2a68 100644
--- a/ports/libmagic/CONTROL
+++ b/ports/libmagic/CONTROL
@@ -1,4 +1,4 @@
 Source: libmagic
-Version: 5.37
+Version: 5.37-1
 Homepage: https://github.com/file/file
 Description: This library can be used to classify files according to magic number tests.
 \ No newline at end of file
diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake
index 8eabf13b7..65fe8d8ab 100644
--- a/ports/libmagic/portfile.cmake
+++ b/ports/libmagic/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platform" ON_TARGET "Windows")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO file/file
@@ -10,11 +8,8 @@ vcpkg_from_github(
 
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
-    AUTOCONFIG
 )
-
 vcpkg_install_make()
-
 vcpkg_copy_pdbs()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
@@ -23,7 +18,7 @@ endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man/man5)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/man5)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libmesh/CONTROL b/ports/libmesh/CONTROL
index f0efea8fc..0350119c2 100644
--- a/ports/libmesh/CONTROL
+++ b/ports/libmesh/CONTROL
@@ -1,4 +1,4 @@
 Source: libmesh
-Version: 1.5.0
+Version: 1.5.0-1
 Homepage: https://github.com/libMesh/libmesh
 Description: The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.
diff --git a/ports/libmesh/portfile.cmake b/ports/libmesh/portfile.cmake
index 97a86436d..9a16dbf98 100644
--- a/ports/libmesh/portfile.cmake
+++ b/ports/libmesh/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libMesh/libmesh
@@ -8,9 +6,18 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(OPTIONS --disable-qhull )
+endif()
+# There a lot of configure options in this port which are not yet correctly handled by VCPKG
+# To only mention two:
+#  --enable-vtk-required   Error if VTK is not detected by configure
+#  --enable-capnp-required Error if Cap'n Proto support is not detected by
+# but there are a lot more which need to be checked/fixed
+# So this port can only be considered a Work In Progress
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    OPTIONS ${OPTIONS}
 )
 
 vcpkg_install_make()
diff --git a/ports/libosip2/CONTROL b/ports/libosip2/CONTROL
index 2fe1f8b16..5d172511e 100644
--- a/ports/libosip2/CONTROL
+++ b/ports/libosip2/CONTROL
@@ -1,5 +1,6 @@
 Source: libosip2
-Version: 5.1.0-3
+Version: 5.1.0-4
 Homepage: https://www.gnu.org/software/osip/
 Description: oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.
-Supports: !(windows|uwp)
-\ No newline at end of file
+Build-Depends: pthread
+Supports: !(windows|uwp)
diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake
index 60b5c4558..28321ff45 100644
--- a/ports/libosip2/portfile.cmake
+++ b/ports/libosip2/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} only supports Unix currently." ON_TARGET "Windows")
-
 set(LIBOSIP2_VER "5.1.0")
 
 vcpkg_download_distfile(ARCHIVE
@@ -13,24 +11,18 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
 )
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(OPTIONS --enable-mt=no)
+endif()
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
-    NO_DEBUG
-    AUTO_HOST
-    AUTO_DST
-    PRERUN_SHELL autogen.sh
+    OPTIONS ${OPTIONS}
 )
 
 vcpkg_install_make()
-
+vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(GLOB_RECURSE LIBOSIP2_BINARIES ${CURRENT_PACKAGES_DIR}/lib *.so)
-foreach(LIBOSIP2_BINARY LIBOSIP2_BINARIES)
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        file(COPY ${LIBOSIP2_BINARY} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    endif()
-    file(REMOVE ${LIBOSIP2_BINARY})
-endforeach()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 \ No newline at end of file
diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 2f0e1345d..84cd6c8a2 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -247,8 +247,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     else()
         vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
     endif()
-    #file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}/)
-    #vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+
     message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done")
 else()
     if("${FEATURES}" MATCHES "openssl")
@@ -262,21 +261,19 @@ else()
     endif()
     vcpkg_configure_make(
         SOURCE_PATH ${SOURCE_PATH}
+        COPY_SOURCE
         OPTIONS
             ${BUILD_OPTS}
             --with-includes=${CURRENT_INSTALLED_DIR}/include
         OPTIONS_RELEASE
-            --exec-prefix=${CURRENT_PACKAGES_DIR}/tools/${PORT}
-            --datarootdir=${CURRENT_PACKAGES_DIR}/share/${PORT}
             --with-libraries=${CURRENT_INSTALLED_DIR}/lib
         OPTIONS_DEBUG
-            --exec-prefix=${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}
-            --datarootdir=${CURRENT_PACKAGES_DIR}/debug/share/${PORT}
             --with-libraries=${CURRENT_INSTALLED_DIR}/debug/lib
             --enable-debug
     )
 
     vcpkg_install_make()
+
     # instead?
     #    make -C src/include install
     #    make -C src/interfaces install
diff --git a/ports/libudns/CONTROL b/ports/libudns/CONTROL
index a78adfdf3..d9bb84f9e 100644
--- a/ports/libudns/CONTROL
+++ b/ports/libudns/CONTROL
@@ -1,4 +1,4 @@
 Source: libudns
-Version: 0.4-1
+Version: 0.4-2
 Homepage: https://github.com/ortclib/udns
 Description: The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop.
diff --git a/ports/libudns/ignore_unknown_options.patch b/ports/libudns/ignore_unknown_options.patch
new file mode 100644
index 000000000..4adbcf28c
--- /dev/null
+++ b/ports/libudns/ignore_unknown_options.patch
@@ -0,0 +1,26 @@
+diff --git a/configure b/configure
+index dda98b3ab..6f5f8a3c8 100644
+--- a/configure	
++++ b/configure
+@@ -25,10 +25,9 @@ fi
+ enable() {
+   opt=`echo "$1" | sed 's/^--[^-]*-//'`
+   case "$opt" in
+-    ipv6) ;;
+-    *) echo "configure: unrecognized option \`$1'" >&2; exit 1;;
++    ipv6) eval enable_$opt=$2 ;;
++    *) echo "configure: unrecognized option \`$1'" >&2;;
+   esac
+-  eval enable_$opt=$2
+ }
+ 
+ while [ $# -gt 0 ]; do
+@@ -50,7 +49,7 @@ Optional features (all enabled by default if system supports a feature):
+ EOF
+       exit 0
+       ;;
+-    *) echo "configure: unknown option \`$1'" >&2; exit 1 ;;
++    *) echo "configure: unknown option \`$1'" >&2;;
+   esac
+   shift
+ done
diff --git a/ports/libudns/portfile.cmake b/ports/libudns/portfile.cmake
index 142dc3294..826c4c6c3 100644
--- a/ports/libudns/portfile.cmake
+++ b/ports/libudns/portfile.cmake
@@ -1,4 +1,4 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX")
+vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX") 
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -6,15 +6,16 @@ vcpkg_from_github(
     REF udns_0_4
     SHA512 4df8def718c75872536d42a757237d6c8e0afce8a53aedd7fea73814dc5cf8b5d6c9ae8f01a8cfc76864aa8293c172f08953a6750a66749ba19a3721bb4cf2ec
     HEAD_REF master
+    PATCHES ignore_unknown_options.patch
 )
 
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
-    DISABLE_AUTO_DST
+    COPY_SOURCE
 )
 
 vcpkg_build_make()
-
+vcpkg_fixup_pkgconfig()
 # Install
 if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
     file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libudns.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
diff --git a/ports/libwandio/CONTROL b/ports/libwandio/CONTROL
index f41bf35ff..5fc36ba35 100644
--- a/ports/libwandio/CONTROL
+++ b/ports/libwandio/CONTROL
@@ -1,4 +1,5 @@
 Source: libwandio
-Version: 4.2.1
+Version: 4.2.1-2
 Homepage: https://github.com/wanduow/wandio
-Description: C library for simple and efficient file IO.
-\ No newline at end of file
+Description: C library for simple and efficient file IO.
+Build-Depends: zlib, zstd, liblzma, lz4, curl, pthread, bzip2
+\ No newline at end of file
diff --git a/ports/libwandio/configure.lib.patch b/ports/libwandio/configure.lib.patch
new file mode 100644
index 000000000..57719581e
--- /dev/null
+++ b/ports/libwandio/configure.lib.patch
@@ -0,0 +1,140 @@
+diff --git a/configure.ac b/configure.ac
+index 4579fbb3d..f6be008c8 100644
+--- a/configure.ac	
++++ b/configure.ac
+@@ -112,10 +112,11 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS(stddef.h inttypes.h sys/prctl.h)
+ 
+ # Checks for various "optional" libraries
+-AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
++# AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
++AC_SEARCH_LIBS(pthread_create, [pthreadGC pthreadVC pthread], have_pthread=1, have_pthread=0)
+ 
+ if test "$have_pthread" = 1; then
+-	LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread"
++	LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_pthread_create"
+ 	AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
+ fi
+ 
+@@ -128,12 +129,13 @@ AC_ARG_WITH([bzip2],
+ 
+ AS_IF([test "x$with_bzip2" != "xno"],
+ 	[
+-	AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
++	AC_SEARCH_LIBS(BZ2_bzDecompressInit, [bz2 bz2d bzip2 bzip2d], have_bzip=yes, have_bzip=no)
++	# AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, have_bzip=yes, have_bzip=no)
+ 	], [have_bzip=no])
+ 
+ AS_IF([test "x$have_bzip" = "xyes"], [
+-	if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
+-		LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2"
++	if test "$ac_cv_search_BZ2_bzDecompressInit" != "none required"; then
++		LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_BZ2_bzDecompressInit"
+ 	fi
+ 	with_bzip2=yes
+ 	AC_DEFINE(HAVE_LIBBZ2, 1, "Compiled with bzip2 support")],
+@@ -149,12 +151,13 @@ AC_ARG_WITH([zlib],
+ 
+ AS_IF([test "x$with_zlib" != "xno"],
+ 	[
+-	AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
++	AC_SEARCH_LIBS(deflate, [z zlib zlibd zd], have_zlib=yes, have_zlib=no)
++	# AC_CHECK_LIB(z, deflate, have_zlib=yes, have_zlib=no)
+ 	], [have_zlib=no])
+ 
+ AS_IF([test "x$have_zlib" = "xyes"], [
+-	if test "$ac_cv_lib_z_deflate" != "none required"; then
+-		LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz"
++	if test "$ac_cv_search_deflate" != "none required"; then
++		LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_deflate"
+ 	fi
+ 	AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
+ 	with_zlib=yes],
+@@ -193,12 +196,13 @@ AC_ARG_WITH([lzma],
+ 
+ AS_IF([test "x$with_lzma" != "xno"],
+ 	[
+-	AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
++	# AC_CHECK_HEADER(lzma.h, have_lzma=yes, have_lzma=no)
++    AC_SEARCH_LIBS(lzma_free, [lzma lzmad], have_lzma=yes, have_lzma=no)
+ 	], [have_lzma=no])
+ 
+ AS_IF([test "x$have_lzma" = "xyes"], [
+-	if test "$ac_cv_lib_lzma_code" != "none required"; then
+-		LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzma"
++	if test "$ac_cv_search_lzma_free" != "none required"; then
++		LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_lzma_free"
+ 	fi
+ 	AC_DEFINE(HAVE_LIBLZMA, 1, "Compiled with lzma support")
+ 	with_lzma=yes],
+@@ -215,12 +219,13 @@ AC_ARG_WITH([zstd],
+ 
+ AS_IF([test "x$with_zstd" != "xno"],
+ 	[
+-	AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no)
++    AC_SEARCH_LIBS(ZSTD_createDStream, [zstd zstdd], have_zstd=yes, have_zstd=no)
++	# AC_CHECK_LIB(zstd, ZSTD_createDStream, have_zstd=yes, have_zstd=no)
+ 	], [have_zstd=no])
+ 
+ AS_IF([test "x$have_zstd" = "xyes"], [
+-	if test "$ac_cv_lib_zstd_code" != "none required"; then
+-		LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lzstd"
++	if test "$ac_cv_search_ZSTD_createDStream" != "none required"; then
++		LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_ZSTD_createDStream"
+ 	fi
+ 	AC_DEFINE(HAVE_LIBZSTD, 1, "Compiled with zstd support")
+ 	with_zstd=yes],
+@@ -259,25 +264,28 @@ AC_ARG_WITH([lz4],
+ 
+ AS_IF([test "x$with_lz4" != "xno"],
+         [
+-        AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
++        AC_SEARCH_LIBS(LZ4F_createDecompressionContext, [lz4 lz4d], have_lz4f=yes, have_lz4f=no)
++        # AC_CHECK_LIB(lz4, LZ4F_createDecompressionContext, have_lz4f=yes, have_lz4f=no)
+         ], [have_zstd=no])
+ 
+ AS_IF([test "x$have_lz4f" = "xyes"], [
+-        if test "$ac_cv_lib_lz4_code" != "none required"; then
+-                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llz4"
++        if test "$ac_cv_search_LZ4F_createDecompressionContext" != "none required"; then
++                LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_LZ4F_createDecompressionContext"
+         fi
+         AC_DEFINE(HAVE_LIBLZ4F, 1, "Compiled with lz4 frame support")
+-        AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no)
++        AC_SEARCH_LIBS(LZ4F_getVersion, [lz4 lz4d], have_lz4_173=yes, have_lz4_173=no)
++        # AC_CHECK_LIB(lz4, LZ4F_getVersion, have_lz4_173=yes, have_lz4_173=no)
+         if test "x$have_lz4_173" = "xyes"; then
+                 AC_DEFINE(HAVE_LIBLZ4_MOVABLE, 1, "If defined then liblz4 does NOT have the ERROR_srcPtr_wrong bug")
+         fi
+         with_lz4=frameapi],
+         [
+             AC_DEFINE(HAVE_LIBLZ4F, 0, "Compiled with lz4 frame support")
+-            AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no)
++            AC_SEARCH_LIBS(LZ4_decompress_safe_continue, [lz4 lz4d],  have_lz4s=yes, have_lz4s=no)
++            # AC_CHECK_LIB(lz4, LZ4_decompress_safe_continue, have_lz4s=yes, have_lz4s=no)
+             AS_IF([test "x$have_lz4s" = "xyes"], [
+-                if test "$ac_cv_lib_lz4_code" != "none required"; then
+-                    LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llz4"
++                if test "$ac_cv_search_LZ4_decompress_safe_continue" != "none required"; then
++                    LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_LZ4_decompress_safe_continue"
+                 fi
+                 AC_DEFINE(HAVE_LIBLZ4S, 1, "Compiled with lz4 stream support")
+                 with_lz4=streamapi
+@@ -296,12 +304,14 @@ AC_ARG_WITH([http],
+ AS_IF([test "x$with_http" != "xno"],
+         [
+         # we need curl_easy_pause which was added in 7.18.0
+-        AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)
++        AC_SEARCH_LIBS(curl_easy_pause, [curl curl-d], have_curl=yes, have_curl=no, [-lssl -lcrypto $ac_cv_search_pthread_create -ldl])
++        # AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)
+ 	], [have_curl=no])
+ 
+ AS_IF([test "x$have_curl" = "xyes"], [
+-        if test "$ac_cv_lib_curl_curl_easy_pause" != "none required"; then
+-                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lcurl"
++        if test "$ac_cv_search_curl_easy_pause" != "none required"; then
++                LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_curl_easy_pause -lssl -lcrypto $ac_cv_search_pthread_create -ldl"
++                LIBS="$LIBS -lssl -lcrypto $ac_cv_search_pthread_create -ldl"
+         fi
+         AC_DEFINE(HAVE_HTTP, 1, "Compiled with http support")
+         with_http=yes],
diff --git a/ports/libwandio/portfile.cmake b/ports/libwandio/portfile.cmake
index 20ccce13d..c9be34be6 100644
--- a/ports/libwandio/portfile.cmake
+++ b/ports/libwandio/portfile.cmake
@@ -1,18 +1,16 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platform" ON_TARGET "Windows")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wanduow/wandio
     REF 012b646e7ba7ab191a5a2206488adfac493fcdc6
     SHA512 e94a82038902c34933c4256f8bd4d7ef3f2cf32fea46f8e31a25df34cc90d3a275ff56d3bc9892aca0c85e6d875e696f96a836cc1444fe165db8364331e6e77d
     HEAD_REF master
+    PATCHES configure.lib.patch # This is how configure.ac files with dependencies get fixed. 
 )
 
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
-    AUTOCONFIG
+    COPY_SOURCE
 )
-
 vcpkg_install_make()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL
index 1320ee2cd..38eea5f1a 100644
--- a/ports/libxslt/CONTROL
+++ b/ports/libxslt/CONTROL
@@ -1,5 +1,5 @@
 Source: libxslt
-Version: 1.1.33-6
+Version: 1.1.33-7
 Homepage: https://github.com/GNOME/libxslt
 Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT
 Build-Depends: libxml2, liblzma
diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake
index 5ab963bff..c3296f0fe 100644
--- a/ports/libxslt/portfile.cmake
+++ b/ports/libxslt/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GNOME/libxslt
@@ -105,6 +103,7 @@ else()
     )
     
     vcpkg_install_make()
+    #vcpkg_fixup_pkgconfig()?
     
     if (EXISTS ${CURRENT_PACKAGES_DIR}/bin/xslt-config)
         file(COPY ${CURRENT_PACKAGES_DIR}/bin/xslt-config DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
diff --git a/ports/pfring/CONTROL b/ports/pfring/CONTROL
index 157c9879f..edddaa9a5 100644
--- a/ports/pfring/CONTROL
+++ b/ports/pfring/CONTROL
@@ -1,5 +1,5 @@
 Source: pfring
-Version: 2019-10-17-1
+Version: 2019-10-17-2
 Homepage: https://github.com/ntop/PF_RING
 Description: PF_RING™ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications.
 Build-Depends: libpcap
diff --git a/ports/pfring/makefile.patch b/ports/pfring/makefile.patch
new file mode 100644
index 000000000..cc17fb1f7
--- /dev/null
+++ b/ports/pfring/makefile.patch
@@ -0,0 +1,59 @@
+diff --git a/Makefile b/Makefile
+index 4b377c628..39cbf5cb4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,12 @@
+ all:
+-	cd kernel; make
+-	cd userland; ./configure; make
+-	cd drivers; make
++	$(MAKE) -C kernel;
++	#cd kernel; make
++	cd userland; ./configure;
++	$(MAKE) -C userland;
++	$(MAKE) -C drivers;
+ 
+ install:
+-	cd userland; make install
++	$(MAKE) install -C userland;
+ 
+ clean:
+ 	-cd kernel; make clean
+diff --git a/userland/Makefile b/userland/Makefile
+index 959470c0f..e35ca8de7 100644
+--- a/userland/Makefile
++++ b/userland/Makefile
+@@ -9,22 +9,22 @@ lib/Makefile:
+ config: lib/Makefile
+ 
+ libpfring: config
+-	cd lib; make
++	$(MAKE) -C lib
+ 
+ build_nbpf: config
+-	cd nbpf; make
++	$(MAKE) -C nbpf
+ 
+ build_c++: libpfring
+-	cd c++; make
++	$(MAKE) -C c++
+ 
+ tcpdump/Makefile:
+ 	cd tcpdump; ./configure --with_system_libpcap=yes
+ 
+ build_tcpdump: libpfring tcpdump/Makefile
+-	cd tcpdump; make
++	$(MAKE) -C tcpdump
+ 
+ build_extcap: libpfring
+-	cd wireshark/extcap; make
++	$(MAKE) -C wireshark/extcap
+ 
+ ###################
+ 
+@@ -46,4 +46,4 @@ extcap_clean:
+ 	cd wireshark/extcap; make clean
+ 
+ install: libpfring
+-	cd lib; make install
++	$(MAKE) -C lib install
diff --git a/ports/pfring/portfile.cmake b/ports/pfring/portfile.cmake
index 0df34b475..967bdc5ee 100644
--- a/ports/pfring/portfile.cmake
+++ b/ports/pfring/portfile.cmake
@@ -1,4 +1,4 @@
-vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows")
+vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platforms" ON_TARGET "Windows") 
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -8,16 +8,20 @@ vcpkg_from_github(
     HEAD_REF dev
     PATCHES
         use-vcpkg-libpcap.patch
+        makefile.patch
 )
-
-vcpkg_configure_make(
-    SOURCE_PATH ${SOURCE_PATH}
-    SKIP_CONFIGURE
-)
-
+ 
+file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
+endif()
 set(ENV{VCPKG_LIBPCAP_DIR} "${CURRENT_INSTALLED_DIR}")
-
 vcpkg_build_make()
+vcpkg_fixup_pkgconfig()
+
 vcpkg_copy_pdbs()
 
 # Install manually because pfring cannot set prefix
diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL
index a313ab982..d34e89ad0 100644
--- a/ports/sdl1/CONTROL
+++ b/ports/sdl1/CONTROL
@@ -1,4 +1,4 @@
 Source: sdl1
-Version: 1.2.15-10
+Version: 1.2.15-11
 Homepage: https://www.libsdl.org
 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.
diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake
index 999b616e6..e84582bf0 100644
--- a/ports/sdl1/portfile.cmake
+++ b/ports/sdl1/portfile.cmake
@@ -52,28 +52,13 @@ if (VCPKG_TARGET_IS_WINDOWS)
     endif()
 else()
     message("libgles2-mesa-dev must be installed before sdl1 can build. Install it with \"apt install libgles2-mesa-dev\".")
-    
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        set(BUILD_SHARED yes)
-        set(BUILD_STATIC no)
-    else()
-        set(BUILD_SHARED no)
-        set(BUILD_STATIC yes)
-    endif()
 
-    file(REMOVE_RECURSE ${SOURCE_PATH}/m4)
-    file(MAKE_DIRECTORY ${SOURCE_PATH}/m4)
-    
     vcpkg_configure_make(
-        SOURCE_PATH ${SOURCE_PATH}
-        NO_DEBUG
-        PRERUN_SHELL autogen.sh
-        OPTIONS
-            --enable-shared=${BUILD_SHARED}
-            --enable-static=${BUILD_STATIC}
+        SOURCE_PATH ${SOURCE_PATH}     
     )
     
     vcpkg_install_make()
+    vcpkg_fixup_pkgconfig(IGNORE_FLAGS -Wl,-rpath,\${libdir} SYSTEM_LIBRARIES -lm -ldl -lpthread)
     
     file(GLOB SDL1_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
     foreach (SDL1_TOOL ${SDL1_TOOLS})
@@ -83,4 +68,5 @@ else()
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
     
     file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 endif()
 \ No newline at end of file
diff --git a/ports/tcl/CONTROL b/ports/tcl/CONTROL
index 7bf3da070..7a74eafaf 100644
--- a/ports/tcl/CONTROL
+++ b/ports/tcl/CONTROL
@@ -1,5 +1,5 @@
 Source: tcl
-Version: 8.6.10-3
+Version: core-9-0-a1
 Homepage: https://github.com/tcltk/tcl
 Description: Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.
 
diff --git a/ports/tcl/portfile.cmake b/ports/tcl/portfile.cmake
index 9109ffd34..6e2757f33 100644
--- a/ports/tcl/portfile.cmake
+++ b/ports/tcl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO tcltk/tcl
-    REF 2abfa2c03ddc0419e6525f86c2c0323b2ba1932e
-    SHA512 d9bc83c389cf3b95ab64b75c57eb9a2b23b957503d2dadc2d3f6854e9e784d87d9b2059a82f35accb419693bfe675b523c4751af91efac700644e118ff689fd7)
+    REF 0fa6a4e5aad821a5c34fdfa070c37c3f1ffc8c8e
+    SHA512 9d7f35309fe8b1a7c116639aaea50cc01699787c7afb432389bee2b9ad56a67034c45d90c9585ef1ccf15bdabf0951cbef86257c0c6aedbd2591bbfae3e93b76)
 
 if (VCPKG_TARGET_IS_WINDOWS)
     if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
@@ -92,13 +92,14 @@ if (VCPKG_TARGET_IS_WINDOWS)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
     
 else()
+    file(REMOVE "${SOURCE_PATH}/unix/configure")
     vcpkg_configure_make(
         SOURCE_PATH ${SOURCE_PATH}
-        NO_DEBUG
         PROJECT_SUBPATH unix
     )
     
     vcpkg_install_make()
+    vcpkg_fixup_pkgconfig()
     
     if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
         file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL
index 58dab0c35..b49bf0a77 100644
--- a/ports/x264/CONTROL
+++ b/ports/x264/CONTROL
@@ -1,4 +1,5 @@
 Source: x264
-Version: 157-303c484ec828ed0-7
+Version: 157-303c484ec828ed0-8
 Homepage: https://github.com/mirror/x264
-Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
-\ No newline at end of file
+Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
+Build-Depends: pthread (linux&osx)
+\ No newline at end of file
diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index d1ed982a5..d7aff89d7 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -1,6 +1,6 @@
 set(X264_VERSION 157)
 
-vcpkg_fail_port_install(ON_TARGET "Linux" "OSX")
+vcpkg_fail_port_install(ON_TARGET "OSX") 
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -27,11 +27,7 @@ vcpkg_configure_make(
 )
 
 vcpkg_install_make()
-
-if(NOT VCPKG_TARGET_IS_UWP)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/x264)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x264.exe ${CURRENT_PACKAGES_DIR}/tools/x264/x264.exe)
-endif()
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES -lpthread -lm -ldl)
 
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/lib/pkgconfig
@@ -57,4 +53,4 @@ endif()
 
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
author	Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>	2020-05-21 19:46:07 +0200
committer	GitHub <noreply@github.com>	2020-05-21 10:46:07 -0700
commit	27c6c9420277c533cc4333bdd880f9862012cb72 (patch)
tree	ffb9a979edc97e987ebca77590400e3577b93567 /ports
parent	f6dd5aee5b2ed144a8313a92290771947028e5b6 (diff)
download	vcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.tar.gz vcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.zip