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

Statically link netbsd-iscsi-target against their libiscsi, to avoid a

Browse Source 
conflict between this and ports/devel/libiscsi (which is a dependency of
qemu, causing some developer pain found by claudio@). Conflict reminded
by naddy@.
This commit is contained in:
sthen 2016-01-26 13:40:50 +00:00
parent 0e9102df37
commit 38e06ad700
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/netbsd-iscsi-target/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2015/02/18 12:51:31 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2016/01/26 13:40:50 sthen Exp $
COMMENT= iSCSI (RFC 3720) target from NetBSD
DISTNAME= netbsd-iscsi-20111006
PKGNAME= ${DISTNAME:S/-iscsi/-iscsi-target/}
REVISION= 3
REVISION= 4
CATEGORIES= net sysutils
@ -13,8 +13,6 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c pthread
SHARED_LIBS += iscsi 0.0 # 0.2
MASTER_SITES= http://ftp.netbsd.org/pub/pkgsrc/distfiles/ \
ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/
@ -32,5 +30,6 @@ post-install:
cd ../src; \
${INSTALL_DATA} etc/auths etc/targets examples/* \
${PREFIX}/share/examples/netbsd-iscsi-target
rm ${PREFIX}/lib/lib* ${PREFIX}/man/man3/libiscsi.3
.include <bsd.port.mk>

12
net/netbsd-iscsi-target/patches/patch-src_target_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_target_Makefile_in,v 1.1 2016/01/26 13:40:50 sthen Exp $
--- src/target/Makefile.in.orig Mon May 10 15:48:22 2010
+++ src/target/Makefile.in Thu Oct 22 11:52:03 2015
@@ -210,7 +210,7 @@ top_srcdir = @top_srcdir@
AM_CFLAGS = $(WARNCFLAGS) -pthread
iscsi_target_SOURCES = iscsi-target.c
iscsi_target_CPPFLAGS = -I$(top_srcdir)/include
-iscsi_target_LDADD = ../lib/libiscsi.la -lpthread
+iscsi_target_LDADD = -static ../lib/libiscsi.la -lpthread
man8_MANS = iscsi-target.8
man5_MANS = targets.5
dist_man_MANS = iscsi-target.8 targets.5

6
net/netbsd-iscsi-target/pkg/PLIST
View File

@ -1,9 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2013/05/17 11:13:08 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2016/01/26 13:40:51 sthen Exp $
@bin bin/iscsi-target
lib/libiscsi.a
lib/libiscsi.la
@lib lib/libiscsi.so.${LIBiscsi_VERSION}
@man man/man3/libiscsi.3
@man man/man5/targets.5
@man man/man8/iscsi-target.8
share/doc/netbsd-iscsi-target/