Bug 180395 - [patch] fix use of WITH_OPENSSL_PORT in net/socat
Summary: [patch] fix use of WITH_OPENSSL_PORT in net/socat
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Emanuel Haupt
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-09 01:10 UTC by r4721@tormail.org
Modified: 2013-07-15 14:00 UTC (History)
0 users

See Also:


Attachments
file.diff (374 bytes, patch)
2013-07-09 01:10 UTC, r4721@tormail.org
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description r4721@tormail.org 2013-07-09 01:10:00 UTC
add the local area to ld/cflags. this enables socat to use ports openssl when WITH_OPENSSL_PORT is set.

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-07-09 01:10:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ehaupt

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Emanuel Haupt freebsd_committer freebsd_triage 2013-07-15 12:20:22 UTC
State Changed
From-To: open->feedback

This seems to be already handled by ports/Mk/bsd.openssl.mk.
Comment 3 Emanuel Haupt freebsd_committer freebsd_triage 2013-07-15 12:34:26 UTC
According to ldd it does not appear to be the case. I'm currently
testing the following patch to make it conditional to whether
WITH_OPENSSL_PORT is defined, otherwise the presence of the openssl
port will automatically link socat against the ports version:

Index: Makefile
===================================================================
--- Makefile    (revision 323028)
+++ Makefile    (working copy)
@@ -28,6 +28,11 @@
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_OPENSSL_PORT)
+CFLAGS+=       -I${LOCALBASE}/include/
+LDFLAGS+=      -L${LOCALBASE}/lib/
+.endif
+
 .if(${OSVERSION} >= 1000024)
 CCISCLANG!=    ${CC} --version | ${HEAD} -1 | ${GREP} 'clang'
 .endif
Comment 4 Emanuel Haupt freebsd_committer freebsd_triage 2013-07-15 13:56:25 UTC
State Changed
From-To: feedback->closed

Committed, thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-07-15 13:56:25 UTC
Author: ehaupt
Date: Mon Jul 15 12:56:17 2013
New Revision: 323029
URL: http://svnweb.freebsd.org/changeset/ports/323029

Log:
  Make sure the binaries are linked against the port OpenSSL libraries when
  and only when WITH_OPENSSL_PORT is defined.
  
  PR:             180395 (based on)
  Submitted by:   "r4721@tormail.org" <r4721@tormail.org>

Modified:
  head/net/socat/Makefile

Modified: head/net/socat/Makefile
==============================================================================
--- head/net/socat/Makefile	Mon Jul 15 09:55:03 2013	(r323028)
+++ head/net/socat/Makefile	Mon Jul 15 12:56:17 2013	(r323029)
@@ -3,6 +3,7 @@
 
 PORTNAME=	socat
 PORTVERSION=	1.7.2.2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/ \
 		CRITICAL
@@ -28,6 +29,11 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_OPENSSL_PORT)
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+.endif
+
 .if(${OSVERSION} >= 1000024)
 CCISCLANG!=	${CC} --version | ${HEAD} -1 | ${GREP} 'clang'
 .endif
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"