r1240 - in glibc-package/trunk/debian: . debhelper.in rules.d sysdeps
Author: aurel32
Date: 2006-02-26 15:02:49 +0000 (Sun, 26 Feb 2006)
New Revision: 1240
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install
glibc-package/trunk/debian/debhelper.in/libc-alt.install
glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/linux.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/s390.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* Use the new slibdir, libdir, rtlddir variables to build the various
flavours of the libc. Put them directly in the final directory, and
remove the corresponding tweaks done after the make install phase.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/changelog 2006-02-26 15:02:49 UTC (rev 1240)
@@ -4,6 +4,9 @@
* Use a shell function instead of ifneq when testing a variable depending on
$(curpass), otherwise it is only evaluated at the first pass.
* Add support for the ppc64 architecture. (Closes: #301438).
+ * Use the new slibdir, libdir, rtlddir variables to build the various
+ flavours of the libc. Put them directly in the final directory, and
+ remove the corresponding tweaks done after the make install phase.
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt-dev.install 2006-02-26 15:02:49 UTC (rev 1240)
@@ -1,22 +1,22 @@
-# This file is used for making 64-bit libraries development packages.
-TMPDIR/usr/lib*/libanl.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libBrokenLocale.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libbsd-compat.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libc.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libc_nonshared.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libcrypt.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libdl.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libg.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libieee.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libm.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libmcheck.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libnsl.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libpthread.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libpthread_nonshared.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libresolv.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/librpcsvc.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/librt.a usr/libDESTLIBDIR
-TMPDIR/usr/lib*/libutil.a usr/libDESTLIBDIR
+# This file is used for making biarch libraries development packages.
+TMPDIR/LIBDIR/libanl.a LIBDIR
+TMPDIR/LIBDIR/libBrokenLocale.a LIBDIR
+TMPDIR/LIBDIR/libbsd-compat.a LIBDIR
+TMPDIR/LIBDIR/libc.a LIBDIR
+TMPDIR/LIBDIR/libc_nonshared.a LIBDIR
+TMPDIR/LIBDIR/libcrypt.a LIBDIR
+TMPDIR/LIBDIR/libdl.a LIBDIR
+TMPDIR/LIBDIR/libg.a LIBDIR
+TMPDIR/LIBDIR/libieee.a LIBDIR
+TMPDIR/LIBDIR/libm.a LIBDIR
+TMPDIR/LIBDIR/libmcheck.a LIBDIR
+TMPDIR/LIBDIR/libnsl.a LIBDIR
+TMPDIR/LIBDIR/libpthread.a LIBDIR
+TMPDIR/LIBDIR/libpthread_nonshared.a LIBDIR
+TMPDIR/LIBDIR/libresolv.a LIBDIR
+TMPDIR/LIBDIR/librpcsvc.a* LIBDIR
+TMPDIR/LIBDIR/librt.a LIBDIR
+TMPDIR/LIBDIR/libutil.a LIBDIR
-TMPDIR/usr/lib*/*.o usr/libDESTLIBDIR
-TMPDIR/usr/lib*/*.so usr/libDESTLIBDIR
+TMPDIR/LIBDIR/*.o LIBDIR
+TMPDIR/LIBDIR/*.so LIBDIR
Modified: glibc-package/trunk/debian/debhelper.in/libc-alt.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/debhelper.in/libc-alt.install 2006-02-26 15:02:49 UTC (rev 1240)
@@ -1,6 +1,7 @@
-# This file is used for 64-bit libraries.
-TMPDIR/lib*/*.so* libDESTLIBDIR
-TMPDIR/usr/lib*/gconv/*.so* usr/libDESTLIBDIR/gconv
+# This file is used for biarch libraries.
+TMPDIR/SLIBDIR/*.so* SLIBDIR
+TMPDIR/LIBDIR/gconv/*.so* LIBDIR/gconv/
+
TMPDIR/lib/ldconfig/* lib/ldconfig
TMPDIR/lib/*-*-gnu/ lib
TMPDIR/usr/lib/*-*-gnu/ usr/lib
Modified: glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/debhelper.in/libc-otherbuild.install 2006-02-26 15:02:49 UTC (rev 1240)
@@ -1,3 +1,3 @@
# This file is used for making NPTL and other
# optimized libraries.
-TMPDIR/lib*/*.so* libDESTLIBDIR
+TMPDIR/SLIBDIR/*.so* SLIBDIR
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-02-26 15:02:49 UTC (rev 1240)
@@ -117,14 +117,10 @@
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; do \
- install -m 644 debian/tmp-$(curpass)/usr/lib/$$file \
+ 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 \
debian/tmp-libc/usr/lib/nptl/$$file; \
done; \
- for file in libc.so libpthread.so; do \
- sed 's/ \/lib\// \/lib\/tls\//g;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/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-26 15:02:49 UTC (rev 1240)
@@ -167,7 +167,7 @@
# But after 10 hours of staring at this thing, I can't figure it out.
OPT_PASSES = $(filter-out libc nptl,$(GLIBC_PASSES))
-OPT_DESTDIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_LIBDIR))
+OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
NPTL = $(filter nptl,$(GLIBC_PASSES))
debhelper: $(stamp)debhelper
@@ -188,24 +188,26 @@
esac; \
done
- # Hack: special-case passes whose destdir is 32, 64 or a multiarch
- # directory to use a different install template, which includes more
+ # Hack: special-case passes whose destdir is a biarch directory
+ # to use a different install template, which includes more
# libraries. Also generate a -dev. Other libraries get scripts
# to temporarily disable hwcap. This needs some cleaning up.
- set -- $(OPT_DESTDIRS); \
+ set -- $(OPT_DIRS); \
for x in $(OPT_PASSES); do \
- destdir=$$1; \
+ slibdir=$$1; \
shift; \
z=debian/$(libc)-$$x.install; \
- case $$destdir in \
- 32 | 64 | /*-*-gnu) \
+ case $$slibdir in \
+ /lib32 | /lib64) \
+ libdir=$$1; \
+ shift; \
cp debian/debhelper.in/libc-alt.install $$z; \
zd=debian/$(libc)-dev-$$x.install; \
cp debian/debhelper.in/libc-alt-dev.install $$zd; \
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$zd; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$zd; \
sed -e "s#LIBC#$(libc)#" -i $$z; \
- sed -e "s#DESTLIBDIR#$$destdir#" -i $$zd; \
+ sed -e "s#LIBDIR#$$libdir#g" -i $$zd; \
sed -e "s/^#.*//" -i $$zd; \
;; \
*) \
@@ -222,7 +224,7 @@
esac; \
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
- sed -e "s#DESTLIBDIR#$$destdir#" -i $$z; \
+ sed -e "s#SLIBDIR#$$slibdir#g" -i $$z; \
sed -e "s/^#.*//" -i $$z; \
done
@@ -236,7 +238,7 @@
cat debian/debhelper.in/libc-otherbuild.install >>$$z; \
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
- sed -e "s#DESTLIBDIR#/tls#" -i $$z; \
+ sed -e "s#SLIBDIR#/lib/tls#g" -i $$z; \
case $$z in \
*.install) sed -e "s/^#.*//" -i $$z ;; \
esac; \
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2006-02-26 15:02:49 UTC (rev 1240)
@@ -15,7 +15,7 @@
i686_configure_target=i686-linux
i686_configure_build=i686-linux
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
-i686_LIBDIR = /tls/i686/cmov
+i686_slibdir = /lib/tls/i686/cmov
i686_MIN_KERNEL_SUPPORTED = 2.6.0
i686_extra_config_options = $(extra_config_options) --disable-profile
@@ -34,7 +34,8 @@
amd64_extra_cflags = -O3 -g1
amd64_extra_config_options = $(extra_config_options) --disable-profile \
--includedir=/usr/include/x86_64-linux-gnu
-amd64_LIBDIR = 64
+amd64_slibdir = /lib64
+amd64_libdir = /usr/lib64
amd64_MIN_KERNEL_SUPPORTED = 2.6.0
define amd64_extra_install
Modified: glibc-package/trunk/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2006-02-26 15:02:49 UTC (rev 1240)
@@ -36,8 +36,9 @@
nptl_add-ons = nptl $(add-ons)
nptl_extra_config_options = $(extra_config_options) --disable-profile
nptl_extra_cflags = -g1 -O3
+nptl_slibdir = /lib/tls
+nptl_libdir = /usr/lib/nptl
nptl_MIN_KERNEL_SUPPORTED = 2.6.0
-nptl_LIBDIR = /tls
KERNEL_HEADER_DIR = $(stamp)mkincludedir
$(stamp)mkincludedir:
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-02-26 15:02:49 UTC (rev 1240)
@@ -7,5 +7,6 @@
ppc64_add-ons = nptl $(add-ons)
libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
ppc64_extra_cflags = -O3 -g1
-ppc64_LIBDIR = 64
+ppc64_slibdir = /lib64
+ppc64_libdir = /usr/lib64
ppc64_extra_config_options := $(extra_config_options) --disable-profile
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2006-02-26 15:02:49 UTC (rev 1240)
@@ -7,7 +7,8 @@
s390x_add-ons = linuxthreads $(add-ons)
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_cflags = -g1 -O3
-s390x_LIBDIR = 64
+s390x_slibdir = /lib64
+s390x_libdir = /usr/lib64
s390x_extra_config_options := $(extra_config_options) --disable-profile
define libc6-s390x_extra_pkg_install
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2006-02-24 22:41:14 UTC (rev 1239)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2006-02-26 15:02:49 UTC (rev 1240)
@@ -8,18 +8,19 @@
sparc64_extra_config_options = $(extra_config_options) --disable-profile --without-__thread --without-tls
sparc64_add-ons = linuxthreads $(add-ons)
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
-sparc64_LIBDIR = 64
+sparc64_slibdir = /lib64
+sparc64_libdir = /usr/lib64
sparcv9_MIN_KERNEL_SUPPORTED = 2.4.18
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_LIBDIR = /v9
+sparcv9_slibdir = /lib/v9
sparcv9b_MIN_KERNEL_SUPPORTED = 2.4.18
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_LIBDIR = /ultra3
+sparcv9b_slibdir = /lib/ultra3
Reply to: