Drop cmake/FindBIND.cmake and use LDFLAGS until I understand what magic is

needed to handle RPATH.
This commit is contained in:
ajacoutot 2016-09-07 10:56:02 +00:00
parent 53ad5e95f4
commit 174923e335
2 changed files with 5 additions and 27 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.20 2016/09/06 16:12:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2016/09/07 10:56:02 ajacoutot Exp $
COMMENT= network analysis and security monitoring framework
DISTNAME= bro-2.4.1
REVISION= 2
REVISION= 3
SHARED_LIBS += broccoli 5.1 # 5.1
@ -48,6 +48,9 @@ RUN_DEPENDS += net/curl
CONFIGURE_STYLE= simple
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib/libbind \
-lbind -Wl,-rpath ${LOCALBASE}/lib/libbind"
CONFIGURE_ARGS= --prefix=${PREFIX} \
--conf-files-dir=${SYSCONFDIR}/bro \
--localstatedir=${LOCALSTATEDIR} \

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-cmake_FindBIND_cmake,v 1.1 2016/09/06 16:12:57 ajacoutot Exp $
--- cmake/FindBIND.cmake.orig Fri Sep 4 13:08:06 2015
+++ cmake/FindBIND.cmake Fri Sep 4 13:11:46 2015
@@ -33,6 +33,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# exported in the shared library (strangely)
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=291609
set(bind_libs none libresolv.a resolv bind)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+ set(bind_libs bind)
else ()
set(bind_libs none resolv bind)
endif ()
@@ -45,7 +47,11 @@ foreach (bindlib ${bind_libs})
if (NOT ${bindlib} MATCHES "none")
find_library(BIND_LIBRARY
NAMES ${bindlib}
- HINTS ${BIND_ROOT_DIR}/lib
+ if (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+ HINTS ${BIND_ROOT_DIR}/lib/libbind
+ else
+ HINTS ${BIND_ROOT_DIR}/lib
+ endif ()
)
endif ()