Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Aug 2003 21:06:24 +0200
From:      Eirik Nygaard <eirikn@bluezone.no>
To:        arch@freebsd.org
Subject:   Re: module opt_* building
Message-ID:  <20030812190624.GA10954@eirikn.net>
In-Reply-To: <20030803120321.GA26612@eirikn.net>
References:  <20030723100444.GA83571@eirikn.net> <20030803120321.GA26612@eirikn.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--24zk1gE8NUlDmwG9
Content-Type: multipart/mixed; boundary="h31gzZEtNLTqOjlF"
Content-Disposition: inline


--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Aug 03, 2003 at 02:03:21PM +0200, Eirik Nygaard wrote:
> On Wed, Jul 23, 2003 at 12:04:44PM +0200, Eirik Nygaard wrote:
> > I did not come up with another way to do it so I used the described
> > approach. Did not attach the patch, but it can be found at
> > http://kerneled.com/eirikn/freebsd/kmod_modules.diff
>=20
> Since kerneled.com went down for a unknow reason you I uploaded the patch
> to another website.
> http://eirikn.net/bsd/kmod_modules.diff
>=20

Now I am really sorry, here is the patch. kmod_modules.diff is still to be
added to the modules.

--=20

Eirik Nygaard <eirikn@bluezone.no>
PGP Key: 83C55EDE

--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="kmod.diff"
Content-Transfer-Encoding: quoted-printable

Index: kern.pre.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/sys/conf/kern.pre.mk,v
retrieving revision 1.27
diff -u -d -r1.27 kern.pre.mk
--- kern.pre.mk	11 Jul 2003 07:13:42 -0000	1.27
+++ kern.pre.mk	23 Jul 2003 19:26:15 -0000
@@ -87,7 +87,8 @@
 # MKMODULESENV is set here so that port makefiles can augment
 # them.
=20
-MKMODULESENV=3D	MAKEOBJDIRPREFIX=3D${.OBJDIR}/modules KMODDIR=3D${KODIR}
+MKMODULESENV=3D	MAKEOBJDIRPREFIX=3D${.OBJDIR}/modules MAKEOBJDIR=3D${.OBJD=
IR} \
+		KMODDIR=3D${KODIR}
 .if (${KERN_IDENT} =3D=3D LINT)
 MKMODULESENV+=3D	ALL_MODULES=3DLINT
 .endif
Index: kmod.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/sys/conf/kmod.mk,v
retrieving revision 1.137
diff -u -d -r1.137 kmod.mk
--- kmod.mk	3 Mar 2003 22:51:22 -0000	1.137
+++ kmod.mk	23 Jul 2003 19:26:15 -0000
@@ -241,9 +241,27 @@
 .for _src in ${SRCS:Mopt_*.h}
 CLEANFILES+=3D	${_src}
 .if !target(${_src})
+.if defined(MAKEOBJDIR)
+.if exists(${MAKEOBJDIR}/${_src})
+${_src}:
+	rm -f ${.TARGET} && ln -s ${MAKEOBJDIR}/${_src}
+.else
+.if target(${_src}_def)
+${_src}: ${_src}_def
+.else
+${_src}:
+.endif
+	touch ${.TARGET}
+.endif
+.else
+.if target(${_src}_def)
+${_src}: ${_src}_def
+.else
 ${_src}:
+.endif
 	touch ${.TARGET}
 .endif
+.endif
 .endfor
=20
 MFILES?=3D kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \
@@ -267,7 +285,15 @@
 .if exists(@)
 ${_src}: @/tools/makeobjops.awk @/${_srcsrc}
 .endif
+.if defined(MAKEOBJDIR)
+.if exists(${MAKEOBJDIR}/${_src})
+	ln -sf ${MAKEOBJDIR}/${_src}
+.else
+	${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext}
+.endif
+.else
 	${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext}
+.endif
 .endif
 .endfor # _src
 .endfor # _ext

--h31gzZEtNLTqOjlF--

--24zk1gE8NUlDmwG9
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)

iD8DBQE/OTqw1JB0Z4PFXt4RAhY0AJwKX7sYXPRlmtM44M4bpD5WG3wRmwCdHlSr
JsQRserM8EinWZCANHPzuLo=
=mvDn
-----END PGP SIGNATURE-----

--24zk1gE8NUlDmwG9--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030812190624.GA10954>