Re: *.patch files with subdirectories under ${CONTRIBDIR}
--OXfL5xGRrasGEqWY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Sun, Nov 21, 2004 at 12:56:59PM +0900, YONETANI Tomokazu wrote:
> I'm not 100% sure how to fix this. To only cope with (B), the following
> patch should do the job(though I haven't gone though full buildworld yet).
(A) is a known problem and I'm not sure if we can fix it easily. What do
you think of the atttached patch? It fixes another left-over too.
Joerg
--OXfL5xGRrasGEqWY
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patching.diff"
Index: bsd.hostprog.mk
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/src/share/mk/bsd.hostprog.mk,v
retrieving revision 1.6
diff -u -r1.6 bsd.hostprog.mk
--- bsd.hostprog.mk 21 Jul 2004 13:34:27 -0000 1.6
+++ bsd.hostprog.mk 21 Nov 2004 12:35:08 -0000
@@ -27,8 +27,8 @@
.endif
OBJS+= ${SRCS:N*.h:N*.patch:R:S/$/.no/g}
-.for _PATCH in ${SRCS:T:N*.h.patch:M*.patch}
-.for _OBJ in ${_PATCH:R:R:S/$/.no/}
+.for _PATCH in ${SRCS:T:N*.no_obj.patch:N*.h.patch:M*.patch}
+.for _OBJ in ${_PATCH:R:R:S|,|/|g:S/$/.no/}
OBJS:= ${OBJS:N${_OBJ}} ${_OBJ}
.endfor
.endfor
Index: bsd.lib.mk
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/src/share/mk/bsd.lib.mk,v
retrieving revision 1.7
diff -u -r1.7 bsd.lib.mk
--- bsd.lib.mk 26 Jul 2004 14:29:11 -0000 1.7
+++ bsd.lib.mk 21 Nov 2004 12:35:38 -0000
@@ -149,7 +149,7 @@
.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME)
OBJS+= ${SRCS:N*.h:N*.patch:R:S/$/.o/g}
.for _PATCH in ${SRCS:T:N*.no_obj.patch:N*.h.patch:M*.patch}
-.for _OBJ in ${_PATCH:R:R:S/$/.o/}
+.for _OBJ in ${_PATCH:R:R:S|,|/|g:S/$/.o/}
OBJS:= ${OBJS:N${_OBJ}} ${_OBJ}
.endfor
.endfor
Index: bsd.prog.mk
===================================================================
RCS file: /home/joerg/wd/repository/dragonflybsd/src/share/mk/bsd.prog.mk,v
retrieving revision 1.6
diff -u -r1.6 bsd.prog.mk
--- bsd.prog.mk 26 Jul 2004 14:29:11 -0000 1.6
+++ bsd.prog.mk 21 Nov 2004 12:35:18 -0000
@@ -31,7 +31,7 @@
OBJS+= ${SRCS:N*.h:N*.patch:R:S/$/.o/g}
.for _PATCH in ${SRCS:T:N*.no_obj.patch:N*.h.patch:M*.patch}
-.for _OBJ in ${_PATCH:R:R:S/$/.o/}
+.for _OBJ in ${_PATCH:R:R:S|,|/|g:S/$/.o/}
OBJS:= ${OBJS:N${_OBJ}} ${_OBJ}
.endfor
.endfor
--OXfL5xGRrasGEqWY--
討論串 (同標題文章)
完整討論串 (本文為第 2 之 5 篇)：