JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build of apr on darwin

Browse Source 
svn path=/nixpkgs/trunk/; revision=34374
This commit is contained in:
Marco Maggesi 2012-06-06 21:44:20 +00:00
parent cadc02cb2b
commit 93f41f5ad3
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/apr/darwin_fix_configure.patch Normal file
View File

@ -0,0 +1,17 @@
diff -Nuar apr-1.4.6/configure apr-1.4.6-darwin-fix-configure/configure
--- apr-1.4.6/configure 2012-02-08 00:17:57.000000000 +0100
+++ apr-1.4.6-darwin-fix-configure/configure 2012-06-06 23:08:56.000000000 +0200
@@ -6854,10 +6854,10 @@
*-apple-darwin*)
if test "x$CPPFLAGS" = "x"; then
- test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\""
- CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK\""
+ CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
else
- apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
+ apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK"
for i in $apr_addto_bugger; do
apr_addto_duplicate="0"
for j in $CPPFLAGS; do

6
pkgs/development/libraries/apr/default.nix
View File

@ -1,5 +1,9 @@
{ stdenv, fetchurl }:
let
inherit (stdenv.lib) optionals;
in
stdenv.mkDerivation rec {
name = "apr-1.4.6";
@ -8,6 +12,8 @@ stdenv.mkDerivation rec {
md5 = "ffee70a111fd07372982b0550bbb14b7";
};
patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
configureFlags =
# Don't use accept4 because it's only supported on Linux >= 2.6.28.
[ "apr_cv_accept4=no" ]