Author: aurel32
Date: 2006-03-02 00:28:32 +0000 (Thu, 02 Mar 2006)
New Revision: 1259
Modified:
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk
glibc-package/trunk/debian/sysdeps/linux.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* 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.
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-03-01 18:57:39 UTC (rev
1258)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-03-02 00:28:32 UTC (rev
1259)
@@ -117,10 +117,14 @@
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
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2006-03-01 18:57:39 UTC (rev
1258)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2006-03-02 00:28:32 UTC (rev
1259)
@@ -15,6 +15,7 @@
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
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk 2006-03-01 18:57:39 UTC
(rev 1258)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-i386.mk 2006-03-02 00:28:32 UTC
(rev 1259)
@@ -7,5 +7,6 @@
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
Modified: glibc-package/trunk/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk 2006-03-01 18:57:39 UTC (rev
1258)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2006-03-02 00:28:32 UTC (rev
1259)
@@ -36,8 +36,8 @@
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
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2006-03-01 18:57:39 UTC (rev
1258)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2006-03-02 00:28:32 UTC (rev
1259)
@@ -16,6 +16,7 @@
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_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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
