summaryrefslogtreecommitdiff
path: root/devel/poco/patches/patch-ae
blob: 74902e645809d41eba55a4549fb7510750070c58 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
$NetBSD: patch-ae,v 1.3 2021/04/08 08:21:58 wiz Exp $

# clean up the FreeBSD configuration to fit better with pkgsrc

# Build a full set of shared library search paths, rather than
# *assuming* everything is under PREFIX.

--- build/config/FreeBSD.orig	2015-08-04 05:20:55.000000000 +0000
+++ build/config/FreeBSD
@@ -20,7 +20,9 @@ CXX     = g++
 LINK    = $(CXX)
 LIB     = ar -cr
 RANLIB  = ranlib
-SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
+SHLIBFLAGS = -L$(POCO_PREFIX)/lib -Wl,-rpath,$(POCO_PREFIX)/lib \
+		$(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p))
+SHLIB   = $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-rpath,$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
 DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
 STRIP   = strip
@@ -38,13 +40,13 @@ SHAREDLIBLINKEXT = .so
 #
 # Compiler and Linker Flags
 #
-CFLAGS          = 
+CFLAGS          ?= 
 CFLAGS32        =
 CFLAGS64        =
 CXXFLAGS        =
 CXXFLAGS32      =
 CXXFLAGS64      =
-LINKFLAGS       =
+LINKFLAGS       = ${LDFLAGS}
 LINKFLAGS32     =
 LINKFLAGS64     =
 STATICOPT_CC    =
@@ -52,7 +54,7 @@ STATICOPT_CXX   =
 STATICOPT_LINK  = -static
 SHAREDOPT_CC    = -fPIC
 SHAREDOPT_CXX   = -fPIC
-SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)
+SHAREDOPT_LINK  = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(POCO_PREFIX)/lib -L$(LIBPATH)
 DEBUGOPT_CC     = -g -D_DEBUG
 DEBUGOPT_CXX    = -g -D_DEBUG
 DEBUGOPT_LINK   = -g