Mercurial > hg > aboriginal

annotate sources/patches/uClibc-install2.patch @ 979:88b354c0eee1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tweak mercurial repo entry and add link to current snapshot.
author Rob Landley <rob@landley.net>
date Tue, 16 Feb 2010 06:57:14 -0600
parents 585c77c9e83f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
631
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
1 Index: Makefile.in
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
2 ===================================================================
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
3 --- uClibc/Makefile.in (revision 25418)
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
4 +++ uClibc/Makefile.in (working copy)
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
5 @@ -402,6 +402,7 @@
400
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
6 $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
7 $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
8 done
631
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
9 +ifeq ($(HARDWIRED_ABSPATH),y)
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
10 if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
11 $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
12 $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
13 @@ -409,16 +410,23 @@
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
14 -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
15 $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
16 fi
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
17 +else
400
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
18 + -$(INSTALL) -m 644 lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/
631
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
19 +endif
400
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
20 ifeq ($(UCLIBC_HAS_THREADS),y)
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
21 ifneq ($(LINUXTHREADS_OLD),y)
631
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
22 +ifeq ($(HARDWIRED_ABSPATH),y)
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
23 if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) ] ; then \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
24 $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
25 cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
26 echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/libpthread_nonshared.a )" \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
27 >> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
28 fi
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
29 +else
400
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
30 + -$(INSTALL) -m 644 lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
31 endif
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
32 endif
631
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
33 +endif
400
f60b1189c0ea Teach build to use recent uClibc snapshot when USE_UNSTABLE=uClibc
Rob Landley <rob@landley.net>
parents:
diff changeset
34 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
631
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
35 $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
36 $(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
37 Index: extra/Configs/Config.in
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
38 ===================================================================
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
39 --- uClibc/extra/Configs/Config.in (revision 25418)
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
40 +++ uClibc/extra/Configs/Config.in (working copy)
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
41 @@ -1812,6 +1812,26 @@
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
42 For a typical target system this should be set to "/usr", such that
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
43 'make install' will install /usr/include/<header files>.
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
44
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
45 +config HARDWIRED_ABSPATH
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
46 + string "Hardwire absolute paths into linker scripts"
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
47 + default y
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
48 + help
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
49 + This prepends absolute paths to the libraries mentioned in linker
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
50 + scripts such as libc.so.
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
51 +
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
52 + This is a build time optimization. It has no impact on dynamic
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
53 + linking at runtime, which doesn't use linker scripts.
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
54 +
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
55 + You must disable this to use uClibc with a relocatable toolchain,
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
56 + such as the prebuilt binary cross compilers at
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
57 + http://uclibc.org/downloads/binaries which may be installed at an
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
58 + arbitrary location (such as in a user's home directory).
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
59 +
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
60 + The amount of time saved by this optimization is actually too small to
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
61 + measure. The linker just had to search the library path to find the
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
62 + linker script, so the dentries are cache hot if it has to search the
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
63 + same path again. But it's what glibc does, so we do it too.
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
64 +
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
65 endmenu
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
66
585c77c9e83f Upgrade to uClibc-0.9.30.1 (and tweak lots of UNSTABLE URLs).
Rob Landley <rob@landley.net>
parents: 469
diff changeset
67