Author: ludo
Date: Thu Feb 23 00:01:24 2012
New Revision: 32498
URL: https://nixos.org/websvn/nix/?rev=32498&sc=1
Log:
Samba: Fix compilation for GNU/Hurd; add to Hydra.
Added:
nixpkgs/trunk/pkgs/servers/samba/libnss-wins-pthread.patch
Modified:
nixpkgs/trunk/pkgs/servers/samba/default.nix
nixpkgs/trunk/pkgs/top-level/release-cross.nix
Modified: nixpkgs/trunk/pkgs/servers/samba/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/samba/default.nix Thu Feb 23 00:01:19
2012 (r32497)
+++ nixpkgs/trunk/pkgs/servers/samba/default.nix Thu Feb 23 00:01:24
2012 (r32498)
@@ -28,6 +28,9 @@
patches =
[ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541.
./readlink.patch
+
+ # Allow cross-builds for GNU/Hurd.
+ ./libnss-wins-pthread.patch
];
buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ]
@@ -39,7 +42,7 @@
# XXX: Awful hack to allow cross-compilation.
'' sed -i source3/configure \
-e 's/^as_fn_error \("cannot run test program while cross
compiling\)/$as_echo \1/g'
- '';
+ ''; # "
preConfigure =
'' cd source3
Added: nixpkgs/trunk/pkgs/servers/samba/libnss-wins-pthread.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/servers/samba/libnss-wins-pthread.patch Thu Feb 23
00:01:24 2012 (r32498)
@@ -0,0 +1,15 @@
+`libnss_wins' uses pthreads but is built without `-pthread'. This is
+not a problem when building natively on GNU/Linux, but causes troubles
+when cross-building for GNU/Hurd (undefined references to libpthread
+functions.)
+
+--- samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:15.000000000 +0100
++++ samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:47.000000000 +0100
+@@ -2760,6 +2760,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP
+ @echo "Linking $@"
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
+ $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS)
$(LIBTDB_LIBS) $(ZLIB_LIBS) \
++ $(PTHREAD_LDFLAGS) \
+ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
+
+ bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS)
$(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
Modified: nixpkgs/trunk/pkgs/top-level/release-cross.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release-cross.nix Thu Feb 23 00:01:19
2012 (r32497)
+++ nixpkgs/trunk/pkgs/top-level/release-cross.nix Thu Feb 23 00:01:24
2012 (r32498)
@@ -205,6 +205,7 @@
nixUnstable.hostDrv = nativePlatforms;
openssl.hostDrv = nativePlatforms; # dependency of Nix
patch.hostDrv = nativePlatforms;
+ samba_light.hostDrv = nativePlatforms; # needed for `runInGenericVM'
zile.hostDrv = nativePlatforms;
};
}) // (
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
