Tue Oct 4 14:33:16 2016 UTC ()
Hack for powerpc64


(christos)
diff -r1.9 -r1.10 src/external/gpl2/lvm2/lib/libdevmapper/Makefile
cvs diff -r1.9 -r1.10 src/external/gpl2/lvm2/lib/libdevmapper/Makefile (expand / switch to unified diff)

--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile 2013/09/11 23:04:10 1.9
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile 2016/10/04 14:33:16 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2013/09/11 23:04:10 joerg Exp $ 1# $NetBSD: Makefile,v 1.10 2016/10/04 14:33:16 christos Exp $
2 2
3USE_SHLIBDIR= yes 3USE_SHLIBDIR= yes
4USE_FORT?= no 4USE_FORT?= no
5NOLINT= #defined 5NOLINT= #defined
6 6
7.include "../../lvm2tools.mk" 7.include "../../lvm2tools.mk"
8 8
9LIB= devmapper 9LIB= devmapper
10 10
11CWARNFLAGS.clang+= -Wno-comment -Wno-parentheses -Wno-switch 11CWARNFLAGS.clang+= -Wno-comment -Wno-parentheses -Wno-switch
12 12
13CPPFLAGS+= -I${LIBDEVMAPPER_DISTDIR} \ 13CPPFLAGS+= -I${LIBDEVMAPPER_DISTDIR} \
14 -I${LIBDEVMAPPER_DISTDIR}/misc \ 14 -I${LIBDEVMAPPER_DISTDIR}/misc \
@@ -25,20 +25,25 @@ LIBDPLIBS+= dm ${NETBSDSRCDIR}/lib/libdm @@ -25,20 +25,25 @@ LIBDPLIBS+= dm ${NETBSDSRCDIR}/lib/libdm
25 25
26SRCS+= bitset.c hash.c list.c libdm-common.c libdm-file.c \ 26SRCS+= bitset.c hash.c list.c libdm-common.c libdm-file.c \
27 libdm-deptree.c libdm-string.c libdm-report.c \ 27 libdm-deptree.c libdm-string.c libdm-report.c \
28 dbg_malloc.c pool.c matcher.c parse_rx.c ttree.c \ 28 dbg_malloc.c pool.c matcher.c parse_rx.c ttree.c \
29 libdm-nbsd-iface.c libdm_netbsd.c 29 libdm-nbsd-iface.c libdm_netbsd.c
30 30
31.ifdef RUMP_ACTION 31.ifdef RUMP_ACTION
32CPPFLAGS+= -DRUMP_ACTION -DRUMP_SYS_IOCTL -DRUMP_SYS_CLOSE -DRUMP_SYS_OPEN 32CPPFLAGS+= -DRUMP_ACTION -DRUMP_SYS_IOCTL -DRUMP_SYS_CLOSE -DRUMP_SYS_OPEN
33LDADD+= -lrumpdev_disk -lrumpdev_dm -lrumpdev 33LDADD+= -lrumpdev_disk -lrumpdev_dm -lrumpdev
34LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread 34LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
35DBG= -g 35DBG= -g
36.endif 36.endif
37 37
 38# call to `dm_lib_release' lacks nop, can't restore toc; recompile with -fPIC
 39.if ${MACHINE_ARCH} == "powerpc64"
 40COPTS.libdm-nbsd-iface.c+= -O0
 41.endif
 42
38.PATH: ${LIBDEVMAPPER_DISTDIR}/ 43.PATH: ${LIBDEVMAPPER_DISTDIR}/
39.PATH: ${LIBDEVMAPPER_DISTDIR}/datastruct 44.PATH: ${LIBDEVMAPPER_DISTDIR}/datastruct
40.PATH: ${LIBDEVMAPPER_DISTDIR}/mm 45.PATH: ${LIBDEVMAPPER_DISTDIR}/mm
41.PATH: ${LIBDEVMAPPER_DISTDIR}/regex 46.PATH: ${LIBDEVMAPPER_DISTDIR}/regex
42.PATH: ${LIBDEVMAPPER_DISTDIR}/ioctl 47.PATH: ${LIBDEVMAPPER_DISTDIR}/ioctl
43 48
44.include <bsd.lib.mk> 49.include <bsd.lib.mk>