Merge pull request #5004 from NixOS/remove-gcc33

remove gcc 3.3 and snx ("SSL Network Extender")
This commit is contained in:
Aristid Breitkreuz 2014-11-16 16:00:51 +01:00
commit 9f5c6d57cb
4 changed files with 0 additions and 163 deletions

View file

@ -1,86 +0,0 @@
source $stdenv/setup
FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
mkdir $FIXINC_DUMMY
# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
# Thing.
export CPP="gcc -E"
preConfigure() {
if test "$noSysDirs" = "1"; then
# Disable the standard include directories.
cat >> ./gcc/cppdefault.h <<EOF
#undef LOCAL_INCLUDE_DIR
#undef SYSTEM_INCLUDE_DIR
#undef STANDARD_INCLUDE_DIR
EOF
fi
# Determine the frontends to build.
langs="c"
if test -n "$langCC"; then
langs="$langs,c++"
fi
if test -n "$langFortran"; then
langs="$langs,f77"
fi
# Perform the build in a different directory.
mkdir ../build
cd ../build
configureScript=../$sourceRoot/configure
configureFlags="--enable-languages=$langs --disable-multilib"
}
postConfigure() {
if test "$noSysDirs" = "1"; then
# Patch some of the makefiles to force linking against our own
# glibc.
if test -e $NIX_GCC/nix-support/orig-libc; then
# Figure out what extra flags to pass to the gcc compilers
# being generated to make sure that they use our glibc.
extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"
for i in $(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before); do
extraFlags="$extraFlags -Wl,$i"
done
# Use *real* header files, otherwise a limits.h is generated
# that does not include Glibc's limits.h (notably missing
# SSIZE_MAX, which breaks the build).
export FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
fi
mf=Makefile
sed \
-e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraFlags^" \
< $mf > $mf.tmp
mv $mf.tmp $mf
mf=gcc/Makefile
sed \
-e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraFlags^" \
< $mf > $mf.tmp
mv $mf.tmp $mf
# Patch gcc/Makefile to prevent fixinc.sh from "fixing" system
# header files from /usr/include.
mf=gcc/Makefile
sed \
-e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = $FIXINC_DUMMY^" \
< $mf > $mf.tmp
mv $mf.tmp $mf
fi
}
buildFlags="bootstrap"
genericBuild

View file

@ -1,31 +0,0 @@
{ stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
}:
assert langC;
# !!! impurity: finds /usr/bin/as, /usr/bin/ranlib.
stdenv.mkDerivation {
name = "gcc-3.3.6";
builder = ./builder.sh;
src = fetchurl {
url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2;
md5 = "6936616a967da5a0b46f1e7424a06414";
};
# inspiration: https://aur.archlinux.org/packages/g77/
postPatch = ''
substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t
'';
inherit noSysDirs langC langCC langFortran;
meta = {
homepage = "http://gcc.gnu.org/";
license = "GPL/LGPL";
description = "GNU Compiler Collection, 3.3.x";
};
}

View file

@ -1,37 +0,0 @@
{ stdenv, fetchurl, makeWrapper, libX11, pam, gcc33 }:
let
# The proper value for this offset can be found at the top of the snx_install script.
archiveOffset = "78";
libraryPath = stdenv.lib.makeSearchPath "lib" [libX11 pam gcc33.gcc];
in
stdenv.mkDerivation rec {
name = "snx-800007027";
src = fetchurl {
url = "https://remote.us.publicisgroupe.net/CSHELL/snx_install.sh";
sha256 = "1yq0r8gb6jw5pyfrw3wxvplrxxfhbhgm9ph4gyd754fyn52iwgxv";
};
buildInputs = [makeWrapper];
unpackPhase = ''
tail -n +${archiveOffset} ${src} | bunzip2 -c - | tar xfvp -
'';
buildPhase = ''
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" snx
'';
installPhase = ''
mkdir -p "$out/sbin" "$out/libexec"
mv snx "$out/libexec/"
makeWrapper "$out/libexec/snx" "$out/sbin/snx" --prefix LD_LIBRARY_PATH ":" "${libraryPath}"
'';
meta = {
homepage = "https://www.checkpoint.com/";
description = "Check Point SSL Network Extender";
license = "unknown";
};
}

View file

@ -2358,11 +2358,6 @@ let
snort = callPackage ../applications/networking/ids/snort { };
snx = callPackage_i686 ../tools/networking/snx {
inherit (pkgsi686Linux) pam gcc33;
inherit (pkgsi686Linux.xlibs) libX11;
};
solr = callPackage ../servers/search/solr { };
solvespace = callPackage ../applications/graphics/solvespace { };
@ -2978,10 +2973,6 @@ let
gccApple = throw "gccApple is no longer supported";
gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
inherit fetchurl stdenv noSysDirs;
});
gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 {
inherit fetchurl stdenv noSysDirs;
});