mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
98 lines
3.6 KiB
Diff
98 lines
3.6 KiB
Diff
diff -ru a/configure.in b/configure.in
|
|
--- a/configure.in 2011-01-17 23:34:07.000000000 -0500
|
|
+++ b/configure.in 2012-01-25 20:40:27.919485606 -0500
|
|
@@ -841,14 +841,6 @@
|
|
LIBC_PROG_BINUTILS
|
|
AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in
|
|
|
|
-# Accept binutils 2.13 or newer.
|
|
-AC_CHECK_PROG_VER(AS, $AS, --version,
|
|
- [GNU assembler.* \([0-9]*\.[0-9.]*\)],
|
|
- [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
|
|
-AC_CHECK_PROG_VER(LD, $LD, --version,
|
|
- [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
|
|
- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
|
|
-
|
|
# We need the physical current working directory. We cannot use the
|
|
# "pwd -P" shell builtin since that's not portable. Instead we try to
|
|
# find a pwd binary. Note that assigning to the PWD environment
|
|
@@ -2175,6 +2167,7 @@
|
|
fi
|
|
AC_SUBST(old_glibc_headers)
|
|
|
|
+libc_cv_slibdir=${prefix}/lib64
|
|
AC_SUBST(libc_cv_slibdir)
|
|
AC_SUBST(libc_cv_localedir)
|
|
AC_SUBST(libc_cv_sysconfdir)
|
|
diff -ru a/csu/Makefile b/csu/Makefile
|
|
--- a/csu/Makefile 2011-01-17 23:34:07.000000000 -0500
|
|
+++ b/csu/Makefile 2012-01-23 13:58:28.957792633 -0500
|
|
@@ -223,8 +223,7 @@
|
|
if [ -z "$$os" ]; then \
|
|
os=Linux; \
|
|
fi; \
|
|
- printf '"Compiled on a %s %s system on %s.\\n"\n' \
|
|
- "$$os" "$$version" "`date +%Y-%m-%d`";; \
|
|
+ ;; \
|
|
*) ;; \
|
|
esac; \
|
|
files="$(all-Banner-files)"; \
|
|
diff -ru a/elf/Makefile b/elf/Makefile
|
|
--- a/elf/Makefile 2008-10-31 16:35:11.000000000 -0400
|
|
+++ b/elf/Makefile 2012-02-16 12:20:00.038593752 -0500
|
|
@@ -1,4 +1,4 @@
|
|
-# Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1995-2007, 2008, 2009 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
@@ -299,18 +299,11 @@
|
|
z-now-yes = -Wl,-z,now
|
|
|
|
$(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
|
|
- @rm -f $@.lds
|
|
- $(LINK.o) -nostdlib -nostartfiles -shared $(z-now-$(bind-now)) \
|
|
- $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \
|
|
- LC_ALL=C \
|
|
- sed -e '/^=========/,/^=========/!d;/^=========/d' \
|
|
- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
|
|
- > $@.lds
|
|
$(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
|
|
$(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \
|
|
$(filter-out $(map-file),$^) $(load-map-file) \
|
|
- -Wl,-soname=$(rtld-installed-name) -T $@.lds
|
|
- rm -f $@.lds
|
|
+ -Wl,-soname=$(rtld-installed-name) \
|
|
+ -Wl,-defsym=_begin=0
|
|
readelf -s $@ \
|
|
| $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
|
|
|
|
diff -ru a/Makerules b/Makerules
|
|
--- a/Makerules 2011-01-17 23:34:07.000000000 -0500
|
|
+++ b/Makerules 2012-01-30 08:47:56.565068903 -0500
|
|
@@ -977,9 +977,9 @@
|
|
echo ' Use the shared library, but some functions are only in';\
|
|
echo ' the static library, so try that secondarily. */';\
|
|
cat $<; \
|
|
- echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
|
|
- '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
|
|
- ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
|
|
+ echo 'GROUP ( libc.so$(libc.so-version)' \
|
|
+ '$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
|
|
+ ' AS_NEEDED (' $(rtld-installed-name) ') )' \
|
|
) > $@.new
|
|
mv -f $@.new $@
|
|
|
|
diff -ru a/nscd/nscd_stat.c b/nscd/nscd_stat.c
|
|
--- a/nscd/nscd_stat.c 2011-01-17 23:34:07.000000000 -0500
|
|
+++ b/nscd/nscd_stat.c 2012-01-23 15:54:45.231607606 -0500
|
|
@@ -38,7 +38,7 @@
|
|
|
|
|
|
/* We use this to make sure the receiver is the same. */
|
|
-static const char compilation[21] = __DATE__ " " __TIME__;
|
|
+static const char compilation[21] = "don't need this";
|
|
|
|
/* Statistic data for one database. */
|
|
struct dbstat
|