The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commitwip/yesmanc05d829598, reversing changes made tof073df60d6.
Vladimír Čunát
8 years ago
parent
21f9180d49
commit
aa9a04883e
@ -0,0 +1,58 @@ |
||||
# Glibc cannot have itself in its RPATH. |
||||
export NIX_NO_SELF_RPATH=1 |
||||
|
||||
source $stdenv/setup |
||||
|
||||
postConfigure() { |
||||
# Hack: get rid of the `-static' flag set by the bootstrap stdenv. |
||||
# This has to be done *after* `configure' because it builds some |
||||
# test binaries. |
||||
export NIX_CFLAGS_LINK= |
||||
export NIX_LDFLAGS_BEFORE= |
||||
|
||||
export NIX_DONT_SET_RPATH=1 |
||||
unset CFLAGS |
||||
|
||||
# Apparently --bindir is not respected. |
||||
makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") |
||||
} |
||||
|
||||
postInstall() { |
||||
if test -n "$installLocales"; then |
||||
make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales |
||||
fi |
||||
|
||||
test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache |
||||
|
||||
if test -n "$linuxHeaders"; then |
||||
# Include the Linux kernel headers in Glibc, except the `scsi' |
||||
# subdirectory, which Glibc provides itself. |
||||
(cd $dev/include && \ |
||||
ln -sv $(ls -d $linuxHeaders/include/* | grep -v 'scsi$') .) |
||||
fi |
||||
|
||||
# Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink |
||||
# "lib64" to "lib". |
||||
if test -n "$is64bit"; then |
||||
ln -s lib $out/lib64 |
||||
fi |
||||
|
||||
# Get rid of more unnecessary stuff. |
||||
rm -rf $out/var $out/sbin/sln |
||||
|
||||
for i in $out/lib/*.a; do |
||||
strip -S "$i" |
||||
done |
||||
# Put libraries for static linking in a separate output. Note |
||||
# that libc_nonshared.a and libpthread_nonshared.a are required |
||||
# for dynamically-linked applications. |
||||
mkdir -p $static/lib |
||||
mv $out/lib/*.a $static/lib |
||||
mv $static/lib/lib*_nonshared.a $out/lib |
||||
|
||||
# Work around a Nix bug: hard links across outputs cause a build failure. |
||||
cp $bin/bin/getconf $bin/bin/getconf_ |
||||
mv $bin/bin/getconf_ $bin/bin/getconf |
||||
} |
||||
|
||||
genericBuild |
||||
@ -1,36 +0,0 @@ |
||||
--- a/stdlib/setenv.c 2016-05-30 11:09:14.487180254 +0000
|
||||
+++ b/stdlib/setenv.c 2016-05-30 11:08:25.560390748 +0000
|
||||
@@ -277,6 +277,7 @@
|
||||
|
||||
ep = __environ;
|
||||
if (ep != NULL)
|
||||
+ {
|
||||
while (*ep != NULL)
|
||||
if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
|
||||
{
|
||||
@@ -290,6 +291,7 @@
|
||||
}
|
||||
else
|
||||
++ep;
|
||||
+ }
|
||||
|
||||
UNLOCK;
|
||||
|
||||
--- a/nis/nis_call.c 2016-05-30 08:05:59.359855696 -0700
|
||||
+++ b/nis/nis_call.c 2016-05-30 08:05:55.679873221 -0700
|
||||
@@ -680,6 +680,7 @@
|
||||
/* Choose which entry should be evicted from the cache. */
|
||||
loc = &nis_server_cache[0];
|
||||
if (*loc != NULL)
|
||||
+ {
|
||||
for (i = 1; i < 16; ++i)
|
||||
if (nis_server_cache[i] == NULL)
|
||||
{
|
||||
@@ -690,6 +691,7 @@
|
||||
|| ((*loc)->uses == nis_server_cache[i]->uses
|
||||
&& (*loc)->expires > nis_server_cache[i]->expires))
|
||||
loc = &nis_server_cache[i];
|
||||
+ }
|
||||
old = *loc;
|
||||
*loc = new;
|
||||
|
||||
@ -1,38 +0,0 @@ |
||||
See https://github.com/krb5/krb5/pull/467
|
||||
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
|
||||
index 4bb11e4..cb4b44b 100644
|
||||
--- a/src/include/Makefile.in
|
||||
+++ b/src/include/Makefile.in
|
||||
@@ -57,19 +57,19 @@ SBINDIR = @sbindir@
|
||||
LIBDIR = @libdir@
|
||||
SYSCONFCONF = @SYSCONFCONF@
|
||||
|
||||
-PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
|
||||
- -e "s+@PREFIX+$(INSTALL_PREFIX)+" \
|
||||
- -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
|
||||
- -e "s+@BINDIR+$(BINDIR)+" \
|
||||
- -e "s+@LIBDIR+$(LIBDIR)+" \
|
||||
- -e "s+@SBINDIR+$(SBINDIR)+" \
|
||||
- -e "s+@MODULEDIR+$(MODULE_DIR)+" \
|
||||
- -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
|
||||
- -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
|
||||
- -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \
|
||||
- -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \
|
||||
- -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' \
|
||||
- -e 's+@SYSCONFCONF+$(SYSCONFCONF)+'
|
||||
+PROCESS_REPLACE = -e "s\"@KRB5RCTMPDIR\"$(KRB5RCTMPDIR)\"" \
|
||||
+ -e "s\"@PREFIX\"$(INSTALL_PREFIX)\"" \
|
||||
+ -e "s\"@EXEC_PREFIX\"$(INSTALL_EXEC_PREFIX)\"" \
|
||||
+ -e "s\"@BINDIR\"$(BINDIR)\"" \
|
||||
+ -e "s\"@LIBDIR\"$(LIBDIR)\"" \
|
||||
+ -e "s\"@SBINDIR\"$(SBINDIR)\"" \
|
||||
+ -e "s\"@MODULEDIR\"$(MODULE_DIR)\"" \
|
||||
+ -e "s\"@GSSMODULEDIR\"$(GSS_MODULE_DIR)\"" \
|
||||
+ -e "s\"@LOCALSTATEDIR\"$(LOCALSTATEDIR)\"" \
|
||||
+ -e "s\"@RUNSTATEDIR\"$(RUNSTATEDIR)\"" \
|
||||
+ -e "s\"@SYSCONFDIR\"$(SYSCONFDIR)\"" \
|
||||
+ -e "s\"@DYNOBJEXT\"$(DYNOBJEXT)\"" \
|
||||
+ -e "s\"@SYSCONFCONF\"$(SYSCONFCONF)\""
|
||||
|
||||
OSCONFSRC = $(srcdir)/osconf.hin
|
||||
|
||||
Loading…
Reference in new issue