Page MenuHomeFreeBSD

vitual_oss: build system tidying
ClosedPublic

Authored by brooks on Wed, Jan 14, 12:50 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Jan 20, 12:21 PM
Unknown Object (File)
Sun, Jan 18, 1:26 PM
Unknown Object (File)
Fri, Jan 16, 10:27 PM
Unknown Object (File)
Thu, Jan 15, 8:30 AM
Unknown Object (File)
Thu, Jan 15, 7:32 AM
Unknown Object (File)
Thu, Jan 15, 4:32 AM
Unknown Object (File)
Thu, Jan 15, 3:32 AM
Unknown Object (File)
Thu, Jan 15, 1:59 AM
Subscribers

Details

Summary

general:

  • find libsamplerate's headers in the temporary sysroot instead of digging in the source tree.
  • use LIBADD where possible

lib/virtual_oss:

  • centralize SHLIBDIR define
  • centralize include path for internal headers
  • don't try to find libsamplerate directly in .OBJDIR

No functional changes.

Sponsored by: DARPA, AFRL

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Neither lib/virtual_oss nor usr.sbin/virtual_oss build with this patch:

root@freebsd:/mnt/src/lib/virtual_oss # make
Building /usr/obj/mnt/src/amd64.amd64/lib/virtual_oss/null/null.pico
In file included from /mnt/src/lib/virtual_oss/null/null.c:39:
/mnt/src/usr.sbin/virtual_oss/virtual_oss/int.h:33:10: fatal error: 'samplerate.h' file not found
   33 | #include <samplerate.h>

Neither lib/virtual_oss nor usr.sbin/virtual_oss build with this patch:

root@freebsd:/mnt/src/lib/virtual_oss # make
Building /usr/obj/mnt/src/amd64.amd64/lib/virtual_oss/null/null.pico
In file included from /mnt/src/lib/virtual_oss/null/null.c:39:
/mnt/src/usr.sbin/virtual_oss/virtual_oss/int.h:33:10: fatal error: 'samplerate.h' file not found
   33 | #include <samplerate.h>

Direct manual building when you depend on a library that isn't installed isn't supported in FreeBSD's build system. You must build in a make buildenv environment having previously bootstrapped includes (it also won't link since libsamplerate presumably isn't installed.)

This revision is now accepted and ready to land.Thu, Jan 15, 5:57 PM
This revision was automatically updated to reflect the committed changes.