[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

WITH_LIB32 still doesn't work for me



On Friday 19 November 2004 04:25 pm, Sean McNeil wrote:
> On Fri, 2004-11-19 at 22:08 +0000, Bjoern A. Zeeb wrote:
> > On Fri, 19 Nov 2004, Bjoern A. Zeeb wrote:
> > > it seems I have a patch for this now.
> >
> > ok, here[1] we go. This one did the trick for me. Please verify and
> > if someone could test it with NO_KERBEROS= before comitting that
> > would be good.
>
> Bingo!  Thanks, this worked in my configuration.
>
> Cheers,
> Sean

I have a smaller version:

Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.438.2.8
diff -u -r1.438.2.8 Makefile.inc1
--- Makefile.inc1 15 Nov 2004 06:01:11 -0000 1.438.2.8
+++ Makefile.inc1 20 Nov 2004 20:28:22 -0000
@@ -394,6 +394,12 @@
  mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
      -p ${LIB32TMP}/usr/include >/dev/null
  ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.for _t in obj depend all
+ cd ${.CURDIR}/kerberos5/tools; \
+     MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
+.endfor
+.endif
 .for _t in obj includes
  cd ${.CURDIR}/include; \
      ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
@@ -414,12 +420,6 @@
  cd ${.CURDIR}/${_dir}; \
      MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
 .endfor
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
-.for _t in obj depend all
- cd ${.CURDIR}/kerberos5/tools; \
-     MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
-.endfor
-.endif
  cd ${.CURDIR}; \
      ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries 
 .for _t in obj depend all

I think this achieves the same effect, without duplicating the body of 
the for loops..  I'm going to test it shortly..
-- 
Peter Wemm - peter_(_at_)_wemm_(_dot_)_org; peter_(_at_)_FreeBSD_(_dot_)_org; peter_(_at_)_yahoo-inc_(_dot_)_com
"All of this is for nothing if we don't go to the stars" - JMS/B5

Visit your host, monkey.org