diff options
| author | Remy Bohmer <linux@bohmer.net> | 2012-03-28 21:05:01 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-04-03 21:18:50 +0200 |
| commit | f21fe5c720fe323a9215af94773119df712b91d4 (patch) | |
| tree | 49730995cc90a3284e269f3bbece4c1996f37d68 /rules/glibc.make | |
| parent | 32d6ec91e2f71121eae852fb7b3a8fcdccbf4e55 (diff) | |
| download | ptxdist-f21fe5c720fe323a9215af94773119df712b91d4.tar.gz ptxdist-f21fe5c720fe323a9215af94773119df712b91d4.tar.xz | |
Remove hardcoded paths from glibc.make
These hardcoded paths do not work for a multilib environment where
libraries are typically installed in /lib64 for x86-64 instead of /lib
All correct paths can be found by interrogating the compiler toolchain
for the location of these files.
Signed-off-by: Remy Bohmer <linux@bohmer.net>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/glibc.make')
| -rw-r--r-- | rules/glibc.make | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/rules/glibc.make b/rules/glibc.make index 2de7a136f..d2c55190e 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -104,25 +104,24 @@ ifdef PTXCONF_GLIBC_NSL endif ifdef PTXCONF_GLIBC_GCONF_BASE - @$(call install_copy, glibc, 0, 0, 0755, /usr/lib/gconv) - @$(call install_copy_toolchain_lib, glibc, gconv/gconv-modules, /usr/lib/gconv, n) + @$(call install_copy_toolchain_lib, glibc, gconv/gconv-modules,, n) endif ifdef PTXCONF_GLIBC_GCONV_DEF - @$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-1.so, /usr/lib/gconv) - @$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-15.so, /usr/lib/gconv) + @$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-1.so) + @$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-15.so) endif ifdef PTXCONF_GLIBC_GCONV_UTF - @$(call install_copy_toolchain_lib, glibc, gconv/UNICODE.so, /usr/lib/gconv) - @$(call install_copy_toolchain_lib, glibc, gconv/UTF-16.so, /usr/lib/gconv) - @$(call install_copy_toolchain_lib, glibc, gconv/UTF-32.so, /usr/lib/gconv) - @$(call install_copy_toolchain_lib, glibc, gconv/UTF-7.so, /usr/lib/gconv) + @$(call install_copy_toolchain_lib, glibc, gconv/UNICODE.so) + @$(call install_copy_toolchain_lib, glibc, gconv/UTF-16.so) + @$(call install_copy_toolchain_lib, glibc, gconv/UTF-32.so) + @$(call install_copy_toolchain_lib, glibc, gconv/UTF-7.so) endif ifdef PTXCONF_GLIBC_GCONV_ZH - @$(call install_copy_toolchain_lib, glibc, gconv/GBBIG5.so, /usr/lib/gconv) - @$(call install_copy_toolchain_lib, glibc, gconv/GB18030.so, /usr/lib/gconv) + @$(call install_copy_toolchain_lib, glibc, gconv/GBBIG5.so) + @$(call install_copy_toolchain_lib, glibc, gconv/GB18030.so) endif ifdef PTXCONF_GLIBC_I18N_BIN_LOCALE |