mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Fix the build when net/lam installed in system.
PR: ports/117623 and ports/114871 Reported by: Alexander Vasyanin <avasyanin@mail.ru> Koji Yokota <yokota@res.otaru-uc.ac.jp>
This commit is contained in:
parent
96a5012df3
commit
98e28c9f66
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202963
2 changed files with 8 additions and 8 deletions
|
@ -64,8 +64,7 @@ test:
|
|||
fi
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g ; \
|
||||
s|/usr/X11R6|${X11BASE}|g" \
|
||||
@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \
|
||||
${WRKSRC:H:H}/security/coreconf/FreeBSD.mk
|
||||
@${SED} -e 's|@exec_prefix@|${PREFIX}|; \
|
||||
s|@includedir@|${PREFIX}/include/nss|; \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- ../coreconf/FreeBSD.mk.orig Sat Jan 21 03:36:11 2006
|
||||
+++ ../coreconf/FreeBSD.mk Tue Jan 30 21:13:41 2007
|
||||
--- ../coreconf/FreeBSD.mk.orig 2007-10-31 14:02:28.000000000 -0500
|
||||
+++ ../coreconf/FreeBSD.mk 2007-10-31 14:05:56.000000000 -0500
|
||||
@@ -37,9 +37,9 @@
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/UNIX.mk
|
||||
|
@ -28,7 +28,7 @@
|
|||
DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
|
||||
|
||||
#
|
||||
@@ -60,20 +66,18 @@
|
||||
@@ -60,20 +66,19 @@
|
||||
USE_PTHREADS = 1
|
||||
DEFINES += -D_THREAD_SAFE -D_REENTRANT
|
||||
OS_LIBS += -pthread
|
||||
|
@ -49,14 +49,15 @@
|
|||
-DLL_SUFFIX = so.1.0
|
||||
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
|
||||
endif
|
||||
-
|
||||
|
||||
-MKSHLIB = $(CC) $(DSO_LDOPTS)
|
||||
ifdef MAPFILE
|
||||
MKSHLIB += -Wl,--version-script,$(MAPFILE)
|
||||
endif
|
||||
@@ -83,3 +87,5 @@
|
||||
@@ -82,4 +87,5 @@
|
||||
|
||||
G++INCLUDES = -I/usr/include/g++
|
||||
|
||||
INCLUDES += -I/usr/X11R6/include
|
||||
-INCLUDES += -I/usr/X11R6/include
|
||||
+USE_SYSTEM_ZLIB = 1
|
||||
+ZLIB_LIBS = -lz
|
||||
|
|
Loading…
Add table
Reference in a new issue