cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove pthread patch and fix static linking.

Browse Source 
from Brad
This commit is contained in:
ajacoutot 2012-08-25 13:12:59 +00:00
parent 1e85c58f0d
commit 3e47445b0c
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/libproxy/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2012/03/30 16:28:58 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2012/08/25 13:12:59 ajacoutot Exp $
SHARED_ONLY= Yes
@ -13,6 +13,8 @@ PKGNAME-main= libproxy-${VERSION}
PKGNAME-mozilla= libproxy-mozilla-${VERSION}
PKGNAME-webkit= libproxy-webkit-${VERSION}
REVISION-main= 0
CATEGORIES= net
SHARED_LIBS += proxy 1.0 # 0.0
@ -73,8 +75,8 @@ WANTLIB-webkit += gtk-3 javascriptcoregtk-3.0 pango-1.0 pangocairo-1.0
WANTLIB-webkit += pangoft2-1.0 pixman-1 png proxy pthread-stubs soup-2.4
WANTLIB-webkit += webkitgtk-3.0 xcb xcb-render xcb-shm z
CONFIGURE_ARGS= -DCMAKE_C_FLAGS="${CFLAGS} -pthread" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" \
CONFIGURE_ARGS= -DCMAKE_C_FLAGS="${CFLAGS}" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DWITH_PYTHON:BOOL=ON \
-DWITH_PERL:BOOL=ON \
-DWITH_GNOME3:BOOL=ON \

11
net/libproxy/patches/patch-libproxy_cmake_libproxy_cmk
View File

@ -1,15 +1,12 @@
$OpenBSD: patch-libproxy_cmake_libproxy_cmk,v 1.3 2012/03/29 14:58:24 ajacoutot Exp $
Do not link with -lpthread (we use -pthread in CMAKE_C*_FLAGS)
--- libproxy/cmake/libproxy.cmk.orig Mon Jun 6 23:44:37 2011
+++ libproxy/cmake/libproxy.cmk Thu Mar 29 11:29:08 2012
$OpenBSD: patch-libproxy_cmake_libproxy_cmk,v 1.4 2012/08/25 13:12:59 ajacoutot Exp $
--- libproxy/cmake/libproxy.cmk.orig Mon Jun 6 17:44:37 2011
+++ libproxy/cmake/libproxy.cmk Tue Aug 21 05:11:44 2012
@@ -2,7 +2,7 @@ add_library(libproxy SHARED extension_config.cpp exten
if(WIN32)
target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
else()
- target_link_libraries(libproxy modman;m;pthread;dl;${LIBPROXY_LIBRARIES})
+ target_link_libraries(libproxy modman;m;${LIBPROXY_LIBRARIES})
+ target_link_libraries(libproxy modman;m;pthread;${LIBPROXY_LIBRARIES})
endif()
file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
if(WIN32)

16
net/libproxy/patches/patch-libproxy_libproxy-1_0_pc_in
View File

@ -1,10 +1,12 @@
$OpenBSD: patch-libproxy_libproxy-1_0_pc_in,v 1.1 2011/12/05 10:38:42 sthen Exp $
--- libproxy/libproxy-1.0.pc.in.orig Mon Dec 5 10:16:33 2011
+++ libproxy/libproxy-1.0.pc.in Mon Dec 5 10:16:20 2011
@@ -5,5 +5,5 @@ includedir=@PKGCONFIG_INCLUDEDIR@
Name: libproxy-1.0
$OpenBSD: patch-libproxy_libproxy-1_0_pc_in,v 1.2 2012/08/25 13:12:59 ajacoutot Exp $
Needed for static linking.
--- libproxy/libproxy-1.0.pc.in.orig Mon Jun 6 17:44:37 2011
+++ libproxy/libproxy-1.0.pc.in Tue Aug 21 05:10:24 2012
@@ -6,4 +6,5 @@ Name: libproxy-1.0
Description: Proxy Configuration Library
Version: @PROJECT_VERSION@
-Libs: -L${libdir} -lproxy
+Libs: -L${libdir} -lproxy -pthread
Libs: -L${libdir} -lproxy
+Libs.private: -lpthread -lm
Cflags: -I${includedir}