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

* Merge diff between trunk/pkgs@1646 and branches/nixos-pkgs@2256;

Browse Source 
this contains mostly Armijn's pure stdenv-linux.

* After unpacking the statically linked GCC, patch all store paths to
  /nix/store/ffffffffffffffffffffffffffffffff.  Ugly hack to prevent
  undeclared references but it works.

* We don't need Glib's dynamic libraries in the first bootstrap stage;
  delete them.  Actually the downloaded Glibc binary is only needed
  for building Glibc, since GCC needs a C compiler to build some
  programs in `configure'.  So static linking is fine for that.  Maybe
  it would be better to patch `configure' so that we don't need a
  pre-built Glibc at all.

* Set the svn:executable property on `cp' and `patchelf'.

* In Glibc, revert to LinuxThreads.  Maybe NPTL will work, but TLS
  support is a problem.

* Delete most Glibc patches; they're no longer needed since the branch
  updated it to 20050110.
  
* Some cleanups.

svn path=/nixpkgs/trunk/; revision=2258
This commit is contained in:
Eelco Dolstra
2005-02-21 16:03:34 +00:00
parent cdaecff49f 8125cd8915
commit e6744d0f89
35 changed files with 474 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/curl/configure-cxxcpp.patch
+21
View File
@@ -0,0 +1,21 @@
diff -ruN curl-7.12.2/configure curl-7.12.2-new/configure
--- curl-7.12.2/configure 2004-10-18 00:22:10.000000000 +0200
+++ curl-7.12.2-new/configure 2004-12-09 13:58:57.670095179 +0100
@@ -6835,11 +6835,12 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ #{ { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+#See \`config.log' for more details." >&5
+#echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+#See \`config.log' for more details." >&2;}
+ #{ (exit 1); exit 1; }; }
+ :
fi
ac_ext=cc
pkgs/tools/networking/curl/default.nix
+1
View File
@@ -7,5 +7,6 @@ stdenv.mkDerivation {
md5 = "47db6619b849600ba2771074f00da517";
};
buildInputs = [zlib];
patches = [./configure-cxxcpp.patch];
configureFlags = "--without-ssl";
}
pkgs/tools/networking/openssh/builder.sh
+6 -4
View File
@@ -1,9 +1,11 @@
. $stdenv/setup
configureFlags="--with-privsep-path=$out/empty"
installPhase() {
make install-nokeys
}
installPhase=installPhase
genericBuild
rm $out/etc/ssh_host_dsa_key $out/etc/ssh_host_dsa_key.pub $out/etc/ssh_host_key $out/etc/ssh_host_key.pub $out/etc/ssh_host_rsa_key $out/etc/ssh_host_rsa_key.pub
chmod +r $out/libexec/ssh-keysign