* Reduced the size of glibc from 130 to 50 MB.

* Adapted some more packages to use stdenv, "fixed" ld.so problems.
* Added a package for libxslt.

svn path=/nixpkgs/trunk/; revision=204
This commit is contained in:
Eelco Dolstra 2003-07-25 14:59:22 +00:00
parent 1dda526c66
commit 7ec0df788f
16 changed files with 70 additions and 27 deletions

View File

@ -1,6 +1,6 @@
#! /bin/sh
. $stdenv/setup || exit 1
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd aterm-* || exit 1

View File

@ -7,7 +7,15 @@ tar xvfj $glibcSrc || exit 1
mkdir build || exit 1
cd build || exit 1
../glibc-*/configure --prefix=$out --enable-add-ons || exit 1
LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile || exit 1
make || exit 1
make install || exit 1
make localedata/install-locales || exit 1
strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so
strip -s $out/bin/* $out/sbin/* $out/libexec/*
ln -s /etc/ld.so.conf $out/etc/ld.so.conf || exit 1
$out/sbin/ldconfig /lib /usr/lib || exit 1
exit 0

View File

@ -1,9 +1,9 @@
#! /bin/sh
export PATH=/bin:/usr/bin
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd libxml2-* || exit 1
./configure --prefix=$out || exit 1
LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1

View File

@ -1,11 +1,12 @@
Package(
[ ("name", "libxml2-2.5.8")
, ("build", Relative("libxml2/libxml2-build.sh"))
, ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
[ ("url", "ftp://fr.rpmfind.net/pub/libxml/libxml2-2.5.8.tar.gz")
, ("md5", "b2caf6efe9ff9c4d2c175fb0689bd20e")
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
]
)

14
pkgs/libxslt/libxslt-build.sh Executable file
View File

@ -0,0 +1,14 @@
#! /bin/sh
. $stdenv/setup || exit 1
envpkgs="$libxml"
. $setenv
tar xvfz $src || exit 1
cd libxslt-* || exit 1
LDFLAGS=-Wl,-S ./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
echo $envpkgs > $out/envpkgs || exit 1

15
pkgs/libxslt/libxslt.fix Normal file
View File

@ -0,0 +1,15 @@
Package(
[ ("name", "libxslt-1.0.31")
, ("build", Relative("libxslt/libxslt-build.sh"))
, ("setenv", Relative("helpers/set-env.sh"))
, ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
[ ("url", "ftp://xmlsoft.org/libxslt-1.0.31.tar.gz")
, ("md5", "7dbc66a3db621d3f2a6fac4a91ff9af9")
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("libxml", IncludeFix("libxml2/libxml2.fix"))
]
)

View File

@ -1,10 +1,10 @@
#! /bin/sh
export PATH=/bin:/usr/bin
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd openssl-* || exit 1
./config --prefix=$out shared || exit 1
LDFLAGS=-Wl,-S ./config --prefix=$out shared || exit 1
make || exit 1
mkdir $out || exit 1
make install || exit 1

View File

@ -1,9 +1,12 @@
Package(
[ ("name", "openssl-0.9.7b")
, ("build", Relative("openssl/openssl-build.sh"))
, ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
[ ("url", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz")
, ("md5", "fae4bec090fa78e20f09d76d55b6ccff")
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
]
)

View File

@ -1,9 +1,9 @@
#! /bin/sh
export PATH=/bin:/usr/bin
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd sdf2-* || exit 1
LDFLAGS=-s ./configure --prefix=$out --with-aterm=$aterm || exit 1
LDFLAGS=-Wl,-S ./configure --prefix=$out --with-aterm=$aterm || exit 1
make || exit 1
make install || exit 1

View File

@ -8,6 +8,7 @@ Package(
, ("md5", "283be0b4c7c9575c1b5cc735316e6192")
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("aterm", IncludeFix("aterm/aterm.fix"))
]
)

View File

@ -1,18 +1,20 @@
#! /bin/sh
IFS=
realgcc=@GCC@
libc=@LIBC@
justcompile=0
for i in $*; do
for i in $@; do
if test "$i" == "-c"; then
justcompile=1
fi
done
extra="-isystem $libc/include"
extra=("-isystem" "$libc/include")
if test "$justcompile" != "1"; then
extra="$extra -L $libc/lib -Wl,-dynamic-linker,$libc/lib/ld-linux.so.2,-rpath,$libc/lib"
extra=(${extra[@]} "-L" "$libc/lib" "-Wl,-dynamic-linker,$libc/lib/ld-linux.so.2,-rpath,$libc/lib")
fi
exec $realgcc $* $extra
exec $realgcc $@ ${extra[@]}

View File

@ -1,9 +1,9 @@
#! /bin/sh
export PATH=/bin:/usr/bin
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd strategoxt-* || exit 1
LDFLAGS=-s ./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf2 || exit 1
LDFLAGS=-Wl,-S ./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf2 || exit 1
make || exit 1
make install || exit 1

View File

@ -8,6 +8,7 @@ Package(
, ("md5", "0d849a9409c40cdc66cbdee4d00726b2")
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("aterm", IncludeFix("aterm/aterm.fix"))
, ("sdf2", IncludeFix("sdf2/sdf2.fix"))
]

View File

@ -1,10 +1,9 @@
#! /bin/sh
export PATH=$libxml/bin:/bin:/usr/bin:/usr/local/bin
envpkgs="$ssl $db4 $httpd $swig"
. $setenv
. $stdenv/setup || exit 1
export LDFLAGS=-s
envpkgs="$ssl $db4 $httpd $swig $libxml"
. $setenv
if test $localServer; then
extraflags="--with-berkeley-db=$db4 $extraflags"
@ -27,7 +26,7 @@ echo "extra flags: $extraflags"
tar xvfz $src || exit 1
cd subversion-* || exit 1
./configure --prefix=$out $extraflags || exit 1
LDFLAGS=-Wl,-S ./configure --prefix=$out $extraflags || exit 1
make $extramakeflags || exit 1
make install $extramakeflags || exit 1

View File

@ -1,15 +1,17 @@
Package(
[ ("name", "subversion-0.25.0")
[ ("name", "subversion-0.26.0")
, ("build", Relative("subversion/subversion-build.sh"))
, ("setenv", Relative("helpers/set-env.sh"))
, ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
[ ("url", "http://subversion.tigris.org/files/documents/15/5110/subversion-0.25.tar.gz")
, ("md5", "a018220d5c790161bc712ccb7d0f1b38")
[ ("url", "http://subversion.tigris.org/files/documents/15/5322/subversion-0.26.0.tar.gz")
, ("md5", "700caa3f59b585d173812c4a078feeba")
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("httpsClient", "1")
, ("ssl", IncludeFix("openssl/openssl.fix"))
, ("libxml", IncludeFix("libxml2/libxml2.fix"))
]
)

View File

@ -1,11 +1,8 @@
Package(
[ ("name", "system-2")
[ ("name", "system")
, ("build", Relative("system/populate-linkdirs.pl"))
, ("actSubversion", IncludeFix("subversion/subversion.fix"))
, ("actPan", IncludeFix("pan/pan.fix"))
, ("actSylpheed", IncludeFix("sylpheed/sylpheed.fix"))
, ("actMPlayer", IncludeFix("MPlayer/MPlayer.fix"))
, ("actStrategoXT", IncludeFix("strategoxt/strategoxt.fix"))
, ("actATerm", IncludeFix("aterm/aterm.fix"))
]