Re: svn commit: r246827 - in head: contrib/ldns contrib/ldns/compat contrib/ldns/drill contrib/ldns/ldns lib lib/libldns share/mk tools/build/options

2013-02-15 Thread Dag-Erling Smørgrav
...and before someone yells you forgot to update src.conf.5!: no, I
didn't, but the last person who touched bsd.own.mk did, and now I have
conflicts I need to sort out...  *again*

DES
-- 
Dag-Erling Smørgrav - d...@des.no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r246827 - in head: contrib/ldns contrib/ldns/compat contrib/ldns/drill contrib/ldns/ldns lib lib/libldns share/mk tools/build/options

2013-02-15 Thread Jan Beich
Dag-Erling Smørgrav d...@freebsd.org writes:

 Author: des
 Date: Fri Feb 15 13:44:18 2013
 New Revision: 246827
 URL: http://svnweb.freebsd.org/changeset/base/246827

 Log:
   Import LDNS and build it as an internal library.
[...]
 Index: share/mk/bsd.libnames.mk
 ===
 --- share/mk/bsd.libnames.mk  (revision 246826)
 +++ share/mk/bsd.libnames.mk  (revision 246827)
 @@ -85,6 +85,9 @@ LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
  LIBKRB5?=${DESTDIR}${LIBDIR}/libkrb5.a
  LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
  LIBL?=   ${DESTDIR}${LIBDIR}/libl.a
 +.if ${MK_LDNS} != no
 +LIBLDNS?=${DESTDIR}${LIBDIR}/lib_ldns.a
 +.endif
  LIBLN?=  don't use LIBLN, use LIBL
  .if ${MK_BIND} != no
  LIBLWRES?=   ${DESTDIR}${LIBDIR}/liblwres.a

Why the underscore? lib/libldns/Makefile doesn't have it.
Not that WITH_LDNS build would succeed anyway:

  === lib/libldns (depend)
  /usr/src/lib/libldns/../../contrib/ldns/buffer.c:10:10: fatal error: 
'ldns/config.
  h' file not found
  #include ldns/config.h
   ^
  1 error generated.
  mkdep: compile failed
  *** [.depend] Error code 1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r246827 - in head: contrib/ldns contrib/ldns/compat contrib/ldns/drill contrib/ldns/ldns lib lib/libldns share/mk tools/build/options

2013-02-15 Thread Dag-Erling Smørgrav
Jan Beich jbe...@tormail.org writes:
 Why the underscore? lib/libldns/Makefile doesn't have it.

Typo, or rather leftover from an earlier version.

DES
-- 
Dag-Erling Smørgrav - d...@des.no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r246827 - in head: contrib/ldns contrib/ldns/compat contrib/ldns/drill contrib/ldns/ldns lib lib/libldns share/mk tools/build/options

2013-02-15 Thread Dag-Erling Smørgrav
Jan Beich jbe...@tormail.org writes:
 Not that WITH_LDNS build would succeed anyway:

   === lib/libldns (depend)
   /usr/src/lib/libldns/../../contrib/ldns/buffer.c:10:10: fatal error: 
 'ldns/config.
   h' file not found
   #include ldns/config.h
^
   1 error generated.
   mkdep: compile failed
   *** [.depend] Error code 1

Frak, I forgot to commit the generated files :(

DES
-- 
Dag-Erling Smørgrav - d...@des.no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org