cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

serf: support cross compilation

Browse source 
serf consumes apr-util's apu-1-config file to obtain linker flags, so we extend the existing Makefile patch there to also apply to apu-1-config
This commit is contained in:
Colin 2023-04-13 07:04:06 +00:00
parent 90588d5e85
commit ed3f60f8f8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/apr-util/default.nix
View file

@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "-ldb-6.9" "-ldb" --replace "-ldb-6.9" "-ldb"
substituteInPlace apu-1-config \
--replace "-ldb-6.9" "-ldb"
''; '';
propagatedBuildInputs = [ apr expat libiconv libxcrypt ] propagatedBuildInputs = [ apr expat libiconv libxcrypt ]

3
pkgs/development/libraries/serf/scons.patch
View file

@ -11,10 +11,11 @@ index 4358a23..6ce7776 100644
if target in build_targets: if target in build_targets:
return PathVariable.PathIsDirCreate(key, val, env) return PathVariable.PathIsDirCreate(key, val, env)
else: else:
@@ -155,6 +155,7 @@ if sys.platform == 'win32': @@ -155,6 +155,8 @@ if sys.platform == 'win32':
env = Environment(variables=opts, env = Environment(variables=opts,
tools=('default', 'textfile',), tools=('default', 'textfile',),
CPPPATH=['.', ], CPPPATH=['.', ],
+ AR=os.environ['AR'],
+ ENV=os.environ, + ENV=os.environ,
) )