mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 20:03:16 +00:00
06b05d2289
* Extend libc
Include non-libc core libraries in the libc package. Many of these
mirror libraries present in glibc on linux, such as libgcc, libraries
used for iconv, and libraries used for reading kernel info (libkvm,
libprocstat, libmemstat).
Without this many packages outside the freebsd tree would need to be
modified to include standard dependencies which would already be on
the system for other packages.
* Mark FreeBSD as using LLVM
* Update default LLVM version FreeBSD
* Use patch monolith
The patchesRoot system combined with the fact that each derivation
will Request specific names of patches makes it very annoying to use
other FreeBSD source trees with nixpkgs. This new system allows
providing one Or more entire trees of patches whose contents will be
dynamically Parsed and only the relevant patches will be applied for
any one Derivation.
With this commit, the following knobs are available for specifying the
FreeBSD source:
- overriding `freebsd.versionInfo`, for picking another official
supported FreeBSD release.
- overriding `freebsd.source` for specifying a specific unpatched
FreeBSD source tree.
- overriding `freebsd.patches`, for specifying the patches to apply.
Co-Authored-by: Audrey Dutcher <audrey@rhelmot.io>
Co-Authored-by: John Ericson <John.Ericson@Obsidian.Systems>
114 lines
2.8 KiB
Bash
114 lines
2.8 KiB
Bash
# BSD makefiles should be able to detect this
|
|
# but without they end up using gcc on Darwin stdenv
|
|
addMakeFlags() {
|
|
export setOutputFlags=
|
|
|
|
export LIBCRT0=
|
|
export LIBCRTI=
|
|
export LIBCRTEND=
|
|
export LIBCRTBEGIN=
|
|
export LIBC=
|
|
export LIBUTIL=
|
|
export LIBSSL=
|
|
export LIBCRYPTO=
|
|
export LIBCRYPT=
|
|
export LIBCURSES=
|
|
export LIBTERMINFO=
|
|
export LIBM=
|
|
export LIBL=
|
|
|
|
export _GCC_CRTBEGIN=
|
|
export _GCC_CRTBEGINS=
|
|
export _GCC_CRTEND=
|
|
export _GCC_CRTENDS=
|
|
export _GCC_LIBGCCDIR=
|
|
export _GCC_CRTI=
|
|
export _GCC_CRTN=
|
|
export _GCC_CRTDIR=
|
|
|
|
# Definitions passed to share/mk/*.mk. Should be pretty simple -
|
|
# eventually maybe move it to a configure script.
|
|
export DESTDIR=
|
|
export USETOOLS=never
|
|
export NOCLANGERROR=yes
|
|
export NOGCCERROR=yes
|
|
export LEX=flex
|
|
export MKUNPRIVED=yes
|
|
export EXTERNAL_TOOLCHAIN=yes
|
|
|
|
makeFlags="MACHINE=$MACHINE $makeFlags"
|
|
makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags"
|
|
makeFlags="AR=$AR $makeFlags"
|
|
makeFlags="CC=$CC $makeFlags"
|
|
makeFlags="CPP=$CPP $makeFlags"
|
|
makeFlags="CXX=$CXX $makeFlags"
|
|
makeFlags="LD=$LD $makeFlags"
|
|
makeFlags="STRIP=$STRIP $makeFlags"
|
|
|
|
makeFlags="BINDIR=${!outputBin}/bin $makeFlags"
|
|
makeFlags="LIBDIR=${!outputLib}/lib $makeFlags"
|
|
makeFlags="SHLIBDIR=${!outputLib}/lib $makeFlags"
|
|
makeFlags="SHAREDIR=${!outputLib}/share $makeFlags"
|
|
makeFlags="INFODIR=${!outputInfo}/share/info $makeFlags"
|
|
makeFlags="DOCDIR=${!outputDoc}/share/doc $makeFlags"
|
|
makeFlags="LOCALEDIR=${!outputLib}/share/locale $makeFlags"
|
|
|
|
# Parallel building. Needs the space.
|
|
makeFlags="-j $NIX_BUILD_CORES $makeFlags"
|
|
}
|
|
|
|
setBSDSourceDir() {
|
|
sourceRoot=$PWD/$sourceRoot
|
|
export BSDSRCDIR=$sourceRoot
|
|
export _SRC_TOP_=$BSDSRCDIR
|
|
cd $sourceRoot
|
|
}
|
|
|
|
cdBSDPath() {
|
|
if [ -d "$COMPONENT_PATH" ]
|
|
then sourceRoot=$sourceRoot/$COMPONENT_PATH
|
|
cd $COMPONENT_PATH
|
|
fi
|
|
}
|
|
|
|
includesPhase() {
|
|
if [ -z "${skipIncludesPhase:-}" ]; then
|
|
runHook preIncludes
|
|
|
|
local flagsArray=(
|
|
$makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
|
|
includes
|
|
)
|
|
|
|
echoCmd 'includes flags' "${flagsArray[@]}"
|
|
make ${makefile:+-f $makefile} "${flagsArray[@]}"
|
|
|
|
moveUsrDir
|
|
|
|
runHook postIncludes
|
|
fi
|
|
}
|
|
|
|
moveUsrDir() {
|
|
if [ -d $prefix ]; then
|
|
# Remove lingering /usr references
|
|
if [ -d $prefix/usr ]; then
|
|
# Didn't try using rsync yet because per
|
|
# https://unix.stackexchange.com/questions/127712/merging-folders-with-mv,
|
|
# it's not neessarily better.
|
|
pushd $prefix/usr
|
|
find . -type d -exec mkdir -p $out/\{} \;
|
|
find . \( -type f -o -type l \) -exec mv \{} $out/\{} \;
|
|
popd
|
|
fi
|
|
|
|
find $prefix -type d -empty -delete
|
|
fi
|
|
}
|
|
|
|
postUnpackHooks+=(setBSDSourceDir)
|
|
postPatchHooks+=(cdBSDPath)
|
|
preConfigureHooks+=(addMakeFlags)
|
|
preInstallHooks+=(includesPhase)
|
|
fixupOutputHooks+=(moveUsrDir)
|