aboutsummaryrefslogtreecommitdiff
path: root/ports/libproxy
diff options
context:
space:
mode:
authorYuval Gross <52262536+yuvalg-MSFT@users.noreply.github.com>2019-12-03 11:18:49 -0800
committerVictor Romero <romerosanchezv@gmail.com>2019-12-03 11:18:49 -0800
commite9267ac7c40d990c8368861189031bcd5eb77189 (patch)
treec8f3316fddb74b8d01ae36fd0bae3a99b271bc2d /ports/libproxy
parent227d05535901da3372dac2f5fdf4af42cd4e0477 (diff)
downloadvcpkg-e9267ac7c40d990c8368861189031bcd5eb77189.tar.gz
vcpkg-e9267ac7c40d990c8368861189031bcd5eb77189.zip
[proxywrapper] Add new port (#8916)
* adding proxywrapper package * resolving review comments * restrict Linux only * [proxywrapper] Only static library * [libmodman] Move building of tests to a non-default feature * [libproxy] Move tests to a non-default feature * [libproxy] Add features for language bindings * [proxywrapper] Require C++ 11 standard
Diffstat (limited to 'ports/libproxy')
-rw-r--r--ports/libproxy/CONTROL22
-rw-r--r--ports/libproxy/fix-module-lib-name.patch13
-rw-r--r--ports/libproxy/portfile.cmake11
3 files changed, 42 insertions, 4 deletions
diff --git a/ports/libproxy/CONTROL b/ports/libproxy/CONTROL
index 395f19ecd..051420c85 100644
--- a/ports/libproxy/CONTROL
+++ b/ports/libproxy/CONTROL
@@ -1,8 +1,26 @@
Source: libproxy
-Version: 0.4.15
+Version: 0.4.15-1
Homepage: https://github.com/libproxy/libproxy
Description: libproxy is a library that provides automatic proxy configuration management.
Build-Depends: libmodman
+Feature: bindings-csharp
+Description: Install C# bindings
+
+Feature: bindings-python
+Description: Install Python bindings
+
+Feature: bindings-perl
+Description: Install PERL bindings
+
+Feature: bindings-ruby
+Description: Install Ruby bindings
+
+Feature: bindings-vala
+Description: Install Vala bindings
+
Feature: tools
-Description: build tools \ No newline at end of file
+Description: build tools
+
+Feature: tests
+Description: Build libproxy tests
diff --git a/ports/libproxy/fix-module-lib-name.patch b/ports/libproxy/fix-module-lib-name.patch
new file mode 100644
index 000000000..a4d8cb29b
--- /dev/null
+++ b/ports/libproxy/fix-module-lib-name.patch
@@ -0,0 +1,13 @@
+diff --git a/libproxy/Findlibproxy.cmake.in b/libproxy/Findlibproxy.cmake.in
+index ef44489..c0bd2ae 100644
+--- a/libproxy/Findlibproxy.cmake.in
++++ b/libproxy/Findlibproxy.cmake.in
+@@ -12,7 +12,7 @@
+
+ # Find proxy.h and the corresponding library (libproxy.so)
+ FIND_PATH(LIBPROXY_INCLUDE_DIR proxy.h )
+-FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy )
++FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy libproxy)
+
+ # Set library version
+ SET(LIBPROXY_VERSION @PROJECT_VERSION@)
diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake
index 0c872a6cd..214e94675 100644
--- a/ports/libproxy/portfile.cmake
+++ b/ports/libproxy/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
# Enable static build in UNIX
if (VCPKG_TARGET_IS_WINDOWS)
- vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static")
+ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
endif()
vcpkg_from_github(
@@ -17,10 +17,17 @@ vcpkg_from_github(
fix-dependency-libmodman.patch
fix-install-py.patch
fix-arm-build.patch
+ fix-module-lib-name.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
- tools BUILD_TOOLS
+ bindings-csharp WITH_DOTNET
+ bindings-python WITH_PYTHON2
+ bindings-python WITH_PYTHON3
+ bindings-perl WITH_PERL
+ bindings-vala WITH_VALA
+ tools BUILD_TOOLS
+ tests BUILD_TESTING
)
vcpkg_configure_cmake(