wip libc++
This commit is contained in:
parent
3e8344d334
commit
7da056233f
|
@ -46,8 +46,6 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace "-no-cpp-precomp" ""
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -65,6 +65,6 @@ in stdenv.mkDerivation rec {
|
|||
license = stdenv.lib.licenses.bsd3;
|
||||
maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
# broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchsvn, libcxx, libunwind }:
|
||||
{ stdenv, fetchsvn, libcxx, libunwind, gnused }:
|
||||
let
|
||||
rev = "199626";
|
||||
in stdenv.mkDerivation {
|
||||
|
@ -15,17 +15,16 @@ in stdenv.mkDerivation {
|
|||
postUnpack = ''
|
||||
unpackFile ${libcxx.src}
|
||||
export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include -I$(readlink -f libcxx-*)/include"
|
||||
export TRIPLE=x86_64-apple-darwin
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -d -m 755 $out/include $out/lib
|
||||
install -m 644 lib/libc++abi.so.1.0 $out/lib
|
||||
install -m 644 lib/libc++abi.dylib $out/lib
|
||||
install -m 644 include/cxxabi.h $out/include
|
||||
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
|
||||
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
|
||||
'';
|
||||
|
||||
patchPhase = "sed -e s,-lstdc++,, -i lib/buildit";
|
||||
patchPhase = "${gnused}/bin/sed -e s,-lstdc++,, -i lib/buildit";
|
||||
|
||||
buildPhase = "(cd lib; ./buildit)";
|
||||
|
||||
|
|
22
pkgs/development/libraries/libunwind/native.nix
Normal file
22
pkgs/development/libraries/libunwind/native.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ stdenv }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libunwind-native";
|
||||
|
||||
unpackPhase = ":";
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cat ${/usr/lib/system/libunwind.dylib} > $out/lib/libunwind.dylib
|
||||
/usr/bin/install_name_tool \
|
||||
-change /usr/lib/system/libunwind.dylib ${/usr/lib/system/libunwind.dylib} \
|
||||
-change /usr/lib/system/libsystem_malloc.dylib ${/usr/lib/system/libsystem_malloc.dylib} \
|
||||
-change /usr/lib/system/libsystem_pthread.dylib ${/usr/lib/system/libsystem_pthread.dylib} \
|
||||
-change /usr/lib/system/libsystem_platform.dylib ${/usr/lib/system/libsystem_platform.dylib} \
|
||||
-change /usr/lib/system/libsystem_c.dylib ${/usr/lib/system/libsystem_c.dylib} \
|
||||
-change /usr/lib/system/libdyld.dylib ${/usr/lib/system/libdyld.dylib} \
|
||||
-change /usr/lib/system/libkeymgr.dylib ${/usr/lib/system/libkeymgr.dylib} \
|
||||
$out/lib/libunwind.dylib
|
||||
'';
|
||||
}
|
|
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ gmp mpfr ];
|
||||
|
||||
CFLAGS = "-I${gmp}/include";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ gmp ];
|
||||
|
||||
CFLAGS = "-I${gmp}/include";
|
||||
|
||||
configureFlags =
|
||||
/* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite:
|
||||
http://hydra.bordeaux.inria.fr/build/34862
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
|
||||
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig, gnused }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "serf-1.3.7";
|
||||
|
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];
|
||||
|
||||
configurePhase = ''
|
||||
sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
|
||||
sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct
|
||||
sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct
|
||||
${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
|
||||
${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct
|
||||
${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
@ -27,6 +27,11 @@ import ../generic rec {
|
|||
nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
|
||||
nativeLibc = true;
|
||||
inherit stdenv;
|
||||
libcxx = pkgs.libcxx.override {
|
||||
libcxxabi = pkgs.libcxxabi.override {
|
||||
libunwind = pkgs.libunwindNative;
|
||||
};
|
||||
};
|
||||
binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;};
|
||||
clang = pkgs.clang_34;
|
||||
coreutils = pkgs.coreutils;
|
||||
|
|
|
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
|||
postUnpack =
|
||||
'' export CPATH="${bzip2}/include"
|
||||
export LIBRARY_PATH="${bzip2}/lib"
|
||||
export CXX=/usr/bin/clang++
|
||||
export CXXFLAGS="-O3 -Wno-error=reserved-user-defined-literal"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
|
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
CFLAGS=-O3 CXXFLAGS=-O3
|
||||
CFLAGS=-O3
|
||||
'';
|
||||
|
||||
makeFlags = "profiledir=$(out)/etc/profile.d";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
|
||||
, pkgconfig, boehmgc, perlPackages
|
||||
, pkgconfig, boehmgc, perlPackages, bash
|
||||
, storeDir ? "/nix/store"
|
||||
, stateDir ? "/nix/var"
|
||||
}:
|
||||
|
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
|||
postUnpack =
|
||||
'' export CPATH="${bzip2}/include"
|
||||
export LIBRARY_PATH="${bzip2}/lib"
|
||||
export CXXFLAGS="-O3 -Wno-error=reserved-user-defined-literal"
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
|
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
|
||||
--disable-init-state
|
||||
--enable-gc
|
||||
CFLAGS=-O3 CXXFLAGS=-O3
|
||||
CFLAGS=-O3
|
||||
'';
|
||||
|
||||
makeFlags = "profiledir=$(out)/etc/profile.d";
|
||||
|
|
|
@ -13,6 +13,11 @@ stdenv.mkDerivation {
|
|||
docsrc/*.xml
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-libintl-prefix=/usr"
|
||||
"--with-libiconv-prefix=/usr"
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
|
||||
|
|
|
@ -5699,6 +5699,8 @@ let
|
|||
|
||||
libunwind = callPackage ../development/libraries/libunwind { };
|
||||
|
||||
libunwindNative = callPackage ../development/libraries/libunwind/native.nix {};
|
||||
|
||||
libuvVersions = callPackage ../development/libraries/libuv { };
|
||||
|
||||
libv4l = lowPrio (v4l_utils.override {
|
||||
|
|
Loading…
Reference in a new issue