[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>

3 files changed, 72 insertions, 9 deletions

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