diff options
| author | jperkin <jperkin> | 2015-04-27 11:03:42 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-04-27 11:03:42 +0000 |
| commit | 475a7d9d8ac7bbdd80065edef2aa1e4696902508 (patch) | |
| tree | ac7fc5dbe054afe6e45a3cc94c94d619e2e3ca04 /www/libproxy | |
| parent | 12e949d2ac34c154a9270a6714a672bbf61eeb39 (diff) | |
| download | pkgsrc-475a7d9d8ac7bbdd80065edef2aa1e4696902508.tar.gz | |
Fix build on SunOS correctly. Ensure we can link against buildlinked
libraries, and ensure the socket libraries are added for both the main
library and test programs which use the static library.
While here use OPSYSVARS instead of bsd.fast.prefs.mk
Diffstat (limited to 'www/libproxy')
| -rw-r--r-- | www/libproxy/Makefile | 11 | ||||
| -rw-r--r-- | www/libproxy/distinfo | 3 | ||||
| -rw-r--r-- | www/libproxy/patches/patch-libmodman_test_CMakeLists.txt | 16 |
3 files changed, 6 insertions, 24 deletions
diff --git a/www/libproxy/Makefile b/www/libproxy/Makefile index 01dc0cde57a..2e7f2151725 100644 --- a/www/libproxy/Makefile +++ b/www/libproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/08/28 10:58:19 jperkin Exp $ +# $NetBSD: Makefile,v 1.23 2015/04/27 11:03:42 jperkin Exp $ DISTNAME= libproxy-0.4.11 CATEGORIES= www gnome @@ -15,12 +15,11 @@ USE_TOOLS+= pkg-config gmake USE_LANGUAGES= c99 c++ CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF -.include "../../mk/bsd.fast.prefs.mk" +OPSYSVARS+= CMAKE_ARGS -.if ${OPSYS} == "SunOS" -# add libraries needed for Solaris, and add stuff cmake would add it on its own -CMAKE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket ${COMPILER_RPATH_FLAG}${PREFIX}/lib" -.endif +# Need socket libraries on SunOS for both the shared library and test programs. +CMAKE_ARGS.SunOS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" +CMAKE_ARGS.SunOS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake PKGCONFIG_OVERRIDE+= libproxy/libproxy-1.0.pc.in diff --git a/www/libproxy/distinfo b/www/libproxy/distinfo index 80d719309e4..b3a51878e75 100644 --- a/www/libproxy/distinfo +++ b/www/libproxy/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.14 2015/03/16 11:07:34 jperkin Exp $ +$NetBSD: distinfo,v 1.15 2015/04/27 11:03:42 jperkin Exp $ SHA1 (libproxy-0.4.11.tar.gz) = c037969434095bc65d29437e11a7c9e0293a5149 RMD160 (libproxy-0.4.11.tar.gz) = 382110e088faf7a170ac838864d675204d886237 Size (libproxy-0.4.11.tar.gz) = 93757 bytes -SHA1 (patch-libmodman_test_CMakeLists.txt) = 40c9b36d3c866c8fbd3d1bf2a60d38a5129e9827 SHA1 (patch-libproxy_CMakeLists.txt) = fc283f97eebf0ef0cfbd81341a7db311755ab2ec SHA1 (patch-libproxy_modules_config__macosx.cpp) = 75ce7f0f6cc6df17d73ec12051621ec2ebe35ee6 diff --git a/www/libproxy/patches/patch-libmodman_test_CMakeLists.txt b/www/libproxy/patches/patch-libmodman_test_CMakeLists.txt deleted file mode 100644 index 43195cc69d0..00000000000 --- a/www/libproxy/patches/patch-libmodman_test_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-libmodman_test_CMakeLists.txt,v 1.1 2015/03/16 11:07:34 jperkin Exp $ - -Test program needs zlib. - ---- libmodman/test/CMakeLists.txt.orig 2010-08-22 14:02:34.000000000 +0000 -+++ libmodman/test/CMakeLists.txt -@@ -59,7 +59,8 @@ mm_create_program(symbol symbol) - if (WIN32) - mm_create_program(symbollnk symbol ws2_32) - else() -- mm_create_program(symbollnk symbol z) -+ find_package(ZLIB) -+ mm_create_program(symbollnk symbol ${ZLIB_LIBRARY}) - endif() - add_executable(builtin - builtin.cpp |