Commit a38b200c authored by Aurelien Jarno's avatar Aurelien Jarno

* The linker has to be specified for the otherbuild libraries.

* Don't use /usr/lib/nptl as the libdir of the nptl pass, otherwise the
  gconv files are search there.


svn path=/glibc-package/trunk/; revision=1259
parent adbdab8d
......@@ -117,10 +117,14 @@ $(stamp)install_%: $(stamp)check_%
fi; \
done; \
install -d debian/tmp-libc/usr/lib/nptl; \
for file in libc.a libc_nonshared.a libpthread.a libpthread_nonshared.a librt.a libc.so libpthread.so; do \
install -m 644 debian/tmp-$(curpass)/usr/lib/nptl/$$file \
for file in libc.a libc_nonshared.a libpthread.a libpthread_nonshared.a librt.a ; do \
install -m 644 debian/tmp-$(curpass)/usr/lib/$$file \
debian/tmp-libc/usr/lib/nptl/$$file; \
done; \
for file in libc.so libpthread.so; do \
sed 's/\/usr\/lib\//\/usr\/lib\/nptl\//g' < debian/tmp-$(curpass)/usr/lib/$$file \
> debian/tmp-libc/usr/lib/nptl/$$file; \
done; \
ln -sf /lib/tls/librt.so.1 debian/tmp-libc/usr/lib/nptl/; \
fi
......
......@@ -15,6 +15,7 @@ i686_add-ons = nptl $(add-ons)
i686_configure_target=i686-linux
i686_configure_build=i686-linux
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
i686_rtlddir = /lib
i686_slibdir = /lib/tls/i686/cmov
i686_MIN_KERNEL_SUPPORTED = 2.6.0
i686_extra_config_options = $(extra_config_options) --disable-profile
......
......@@ -7,5 +7,6 @@ i686_add-ons = linuxthreads $(add-ons)
i686_configure_target=i686-kfreebsd
i686_configure_build=i686-kfreebsd
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp
......@@ -36,8 +36,8 @@ with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call
nptl_add-ons = nptl $(add-ons)
nptl_extra_config_options = $(extra_config_options) --disable-profile
nptl_extra_cflags = -g1 -O3
nptl_rtlddir = /lib
nptl_slibdir = /lib/tls
nptl_libdir = /usr/lib/nptl
nptl_MIN_KERNEL_SUPPORTED = 2.6.0
KERNEL_HEADER_DIR = $(stamp)mkincludedir
......
......@@ -16,6 +16,7 @@ sparcv9_configure_target=sparcv9-linux
sparcv9_extra_cflags = -g2 -O3
sparcv9_extra_config_options = $(extra_config_options) --disable-profile
sparcv9_add-ons = linuxthreads $(add-ons)
sparcv9_rtlddir = /lib
sparcv9_slibdir = /lib/v9
sparcv9b_MIN_KERNEL_SUPPORTED = 2.4.18
......@@ -23,4 +24,5 @@ sparcv9b_configure_target=sparcv9b-linux
sparcv9b_extra_cflags = -g2 -O3
sparcv9b_extra_config_options = $(extra_config_options) --disable-profile
sparcv9b_add-ons = linuxthreads $(add-ons)
sparcv9b_rtlddir = /lib
sparcv9b_slibdir = /lib/ultra3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment