CVS commit: src/external/cddl/osnet/lib/libnvpair
Module Name:src
Committed By: haad
Date: Mon Feb 22 20:05:03 UTC 2010
Modified Files:
src/external/cddl/osnet/lib/libnvpair: Makefile
Log Message:
Revert lib_nvpair hack now when it is not needed when njoly@ commited his fix to
bsd.lib.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libnvpair/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libnvpair/Makefile
diff -u src/external/cddl/osnet/lib/libnvpair/Makefile:1.4 src/external/cddl/osnet/lib/libnvpair/Makefile:1.5
--- src/external/cddl/osnet/lib/libnvpair/Makefile:1.4 Sun Feb 21 01:46:35 2010
+++ src/external/cddl/osnet/lib/libnvpair/Makefile Mon Feb 22 20:05:03 2010
@@ -1,17 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2010/02/21 01:46:35 darran Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/22 20:05:03 haad Exp $
.PATH: ${.CURDIR}/../../dist/lib/libnvpair
.PATH: ${.CURDIR}/../../dist/common/nvpair
LIB= nvpair
-SRCS= lib_nvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c
-
-lib_nvpair.c: libnvpair.c
- @rm -f ${.TARGET}
- @ln -s ${.ALLSRC} ${.TARGET}
-
-CLEANFILES+=lib_nvpair.c
+SRCS= libnvpair.c nvpair_alloc_system.c nvpair_alloc_fixed.c nvpair.c
.include ../../Makefile.zfs
.include bsd.lib.mk
CVS commit: src/external/cddl/osnet/lib/libnvpair
Module Name:src Committed By: haad Date: Mon Feb 22 20:05:03 UTC 2010 Modified Files: src/external/cddl/osnet/lib/libnvpair: Makefile Log Message: Revert lib_nvpair hack now when it is not needed when njoly@ commited his fix to bsd.lib.mk. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/lib/libnvpair/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/cddl/osnet/lib/libnvpair
On Feb 17, 2010, at 11:10 AM, Nick Hudson wrote: On Wednesday 17 February 2010 17:36:32 Christos Zoulas wrote: Module Name: src Committed By:christos Date:Wed Feb 17 17:36:32 UTC 2010 Modified Files: src/external/cddl/osnet/lib/libnvpair: Makefile Log Message: Fix build issue with our make system building libnvpair.so from libnvpair.c and libnvpair.so from *.so by renaming libnvpair.c to lib_nvpair.c Isn't it time to fix bsd.lib.mk to stop using .so for anything other than a DSO? Agreed. I remember .pico being suggested last time this was brought up. Nick -- thorpej
Re: CVS commit: src/external/cddl/osnet/lib/libnvpair
On Feb 18, 10:11pm, h...@netbsd.org (haad) wrote: -- Subject: Re: CVS commit: src/external/cddl/osnet/lib/libnvpair | 2010/2/17 Christos Zoulas chris...@netbsd.org: | Module Name: =C2=A0 =C2=A0src | Committed By: =C2=A0 christos | Date: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Wed Feb 17 17:36:32 UTC 2010 | | Modified Files: | =C2=A0 =C2=A0 =C2=A0 =C2=A0src/external/cddl/osnet/lib/libnvpair: Makefil= | e | | Log Message: | Fix build issue with our make system building libnvpair.so from libnvpair= | .c | and libnvpair.so from *.so by renaming libnvpair.c to lib_nvpair.c | | | This change seems very strange to me, because I have built libnvpair | zillions times and it worked just fine. What is so special on your | setup that it doesn't build by default for you ? Do you make clean before you build it? Or try touching libnvpair.c after the first build. The point is moot now because Nick is fixing it properly and he or I will remove the hack. christos
re: CVS commit: src/external/cddl/osnet/lib/libnvpair
Well, I think it is worth it because it infrequently breaks random things. I am happy with .ro too for relocatable. let's go with .pico -- crunch already uses .ro.
Re: CVS commit: src/external/cddl/osnet/lib/libnvpair
On Thu, Feb 18, 2010 at 07:39:05AM +1100, matthew green wrote: Well, I think it is worth it because it infrequently breaks random things. I am happy with .ro too for relocatable. let's go with .pico -- crunch already uses .ro. Fine with me. Unless someone beats me, i'll try to have a bsd.lib.mk patch to review/test soon ... -- Nicolas Joly Biological Software and Databanks. Institut Pasteur, Paris.
