r2186 - in glibc-package/trunk/debian: . rules.d sysdeps
Author: aurel32
Date: 2007-05-06 11:35:34 +0000 (Sun, 06 May 2007)
New Revision: 2186
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/ppc64.mk
glibc-package/trunk/debian/sysdeps/s390.mk
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* Merge from multiarch tree:
- debian/rules: define localedir, sysconfdir and rootsbindir.
- debian/rules.d/build.mk: use $(localedir), $(sysconfdir) and
$(rootsbindir) instead of hardcoded values. Make includedir
flavour specific.
- debian/sysdeps/amd64.mk: define i386_includedir.
- debian/sysdeps/powerpc.mk: define ppc64_includedir.
- debian/sysdeps/ppc64.mk: define powerpc_includedir.
- debian/sysdeps/s390.mk: define s390x_includedir.
- debian/sysdeps/kfreebsd-amd64.mk: define i386_includedir.
- debian/sysdeps/sparc.mk: define sparc64_includedir.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/changelog 2007-05-06 11:35:34 UTC (rev 2186)
@@ -17,11 +17,22 @@
(specify r19 as input to asms that save/restore).
* debian/patches/alpha/cvs-cfi.diff: New patch from CVS (fix
cfi instructions in sysdep-cancel.h). Closes: #422067.
- * debian/sysdeps/kfreebsd-i386.mk: Tune for i686.
+ * debian/sysdeps/kfreebsd-i386.mk: tune for i686.
* debian/sysdeps/i386.mk: drop i386-linux-gnu compat symlinks, all the
toolchain is now using i486-linux-gnu.
+ * Merge from multiarch tree:
+ - debian/rules: define localedir, sysconfdir and rootsbindir.
+ - debian/rules.d/build.mk: use $(localedir), $(sysconfdir) and
+ $(rootsbindir) instead of hardcoded values. Make includedir
+ flavour specific.
+ - debian/sysdeps/amd64.mk: define i386_includedir.
+ - debian/sysdeps/powerpc.mk: define ppc64_includedir.
+ - debian/sysdeps/ppc64.mk: define powerpc_includedir.
+ - debian/sysdeps/s390.mk: define s390x_includedir.
+ - debian/sysdeps/kfreebsd-amd64.mk: define i386_includedir.
+ - debian/sysdeps/sparc.mk: define sparc64_includedir.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 06 May 2007 12:53:15 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 06 May 2007 13:33:01 +0200
glibc (2.5-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/rules 2007-05-06 11:35:34 UTC (rev 2186)
@@ -91,12 +91,14 @@
prefix=/usr
bindir=$(prefix)/bin
datadir=$(prefix)/share
+localedir=$(prefix)/lib/locale
+sysconfdir=/etc
+libexecdir=$(prefix)/lib
+rootsbindir=/sbin
includedir=$(prefix)/include
-infodir=$(prefix)/share/info
docdir=$(prefix)/share/doc
mandir=$(prefix)/share/man
sbindir=$(prefix)/sbin
-libexecdir=$(prefix)/lib
BUILD_CC = gcc-4.1
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/rules.d/build.mk 2007-05-06 11:35:34 UTC (rev 2186)
@@ -23,19 +23,23 @@
@echo Configuring $(curpass)
rm -f $(DEB_BUILDDIR)/configparms
- echo "CC = $(call xx,CC)" >> $(DEB_BUILDDIR)/configparms
- echo "BUILD_CC = $(BUILD_CC)" >> $(DEB_BUILDDIR)/configparms
- echo "CFLAGS = $(HOST_CFLAGS)" >> $(DEB_BUILDDIR)/configparms
- echo "BUILD_CFLAGS = $(BUILD_CFLAGS)" >> $(DEB_BUILDDIR)/configparms
- echo "BASH := /bin/bash" >> $(DEB_BUILDDIR)/configparms
- echo "KSH := /bin/bash" >> $(DEB_BUILDDIR)/configparms
- echo "mandir = $(mandir)" >> $(DEB_BUILDDIR)/configparms
- echo "infodir = $(infodir)" >> $(DEB_BUILDDIR)/configparms
- echo "libexecdir = $(libexecdir)" >> $(DEB_BUILDDIR)/configparms
- echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms
- echo "sysconfdir = /etc" >> $(DEB_BUILDDIR)/configparms
- echo "rootsbindir = /sbin" >> $(DEB_BUILDDIR)/configparms
- echo "localedir = /usr/lib/locale" >> $(DEB_BUILDDIR)/configparms
+ echo "CC = $(call xx,CC)" >> $(DEB_BUILDDIR)/configparms
+ echo "BUILD_CC = $(BUILD_CC)" >> $(DEB_BUILDDIR)/configparms
+ echo "CFLAGS = $(HOST_CFLAGS)" >> $(DEB_BUILDDIR)/configparms
+ echo "BUILD_CFLAGS = $(BUILD_CFLAGS)" >> $(DEB_BUILDDIR)/configparms
+ echo "BASH := /bin/bash" >> $(DEB_BUILDDIR)/configparms
+ echo "KSH := /bin/bash" >> $(DEB_BUILDDIR)/configparms
+ echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms
+ echo "bindir = $(bindir)" >> $(DEB_BUILDDIR)/configparms
+ echo "datadir = $(datadir)" >> $(DEB_BUILDDIR)/configparms
+ echo "localedir = $(localedir)" >> $(DEB_BUILDDIR)/configparms
+ echo "sysconfdir = $(sysconfdir)" >> $(DEB_BUILDDIR)/configparms
+ echo "libexecdir = $(libexecdir)" >> $(DEB_BUILDDIR)/configparms
+ echo "rootsbindir = $(rootsbindir)" >> $(DEB_BUILDDIR)/configparms
+ echo "includedir = $(call xx,includedir)" >> $(DEB_BUILDDIR)/configparms
+ echo "docdir = $(docdir)" >> $(DEB_BUILDDIR)/configparms
+ echo "mandir = $(mandir)" >> $(DEB_BUILDDIR)/configparms
+ echo "sbindir = $(sbindir)" >> $(DEB_BUILDDIR)/configparms
libdir="$(call xx,libdir)" ; if test -n "$$libdir" ; then \
echo "libdir = $$libdir" >> $(DEB_BUILDDIR)/configparms ; \
fi
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2007-05-06 11:35:34 UTC (rev 2186)
@@ -17,7 +17,8 @@
i386_configure_target = i486-linux
i386_CC = $(CC) -m32
i386_extra_cflags = -march=pentium4 -g -O3
-i386_extra_config_options = $(extra_config_options) --includedir=/usr/include/i486-linux-gnu
+i386_extra_config_options = $(extra_config_options)
+i386_includedir = /usr/include/i486-linux-gnu
i386_rtlddir = /lib
i386_slibdir = /emul/ia32-linux/lib
i386_libdir = /emul/ia32-linux/usr/lib
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2007-05-06 11:35:34 UTC (rev 2186)
@@ -17,7 +17,8 @@
i386_CC = $(CC) -m32
i386_add-ons = ports linuxthreads $(add-ons)
i386_extra_cflags = -march=pentium4 -g -O3
-i386_extra_config_options = $(extra_config_options) --disable-compatible-utmp --includedir=/usr/include/i486-kfreebsd-gnu
+i386_extra_config_options = $(extra_config_options) --disable-compatible-utmp
+i386_includedir = /usr/include/i486-kfreebsd-gnu
i386_rtlddir = /lib
i386_slibdir = /lib32
i386_libdir = /usr/lib32
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2007-05-06 11:35:34 UTC (rev 2186)
@@ -6,10 +6,10 @@
ppc64_CC = $(CC) -m64
libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
ppc64_extra_cflags = -O3 -g
+ppc64_extra_config_options := $(extra_config_options) --disable-profile
ppc64_slibdir = /lib64
ppc64_libdir = /usr/lib64
-ppc64_extra_config_options := $(extra_config_options) --disable-profile \
- --includedir=/usr/include/powerpc64-linux-gnu
+ppc64_includedir = /usr/include/powerpc64-linux-gnu
define libc6-dev-ppc64_extra_pkg_install
mkdir -p debian/libc6-dev-ppc64/usr/include/gnu
Modified: glibc-package/trunk/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ppc64.mk 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2007-05-06 11:35:34 UTC (rev 2186)
@@ -17,17 +17,17 @@
powerpc_configure_target = powerpc-linux
powerpc_CC = $(CC) -m32
powerpc_extra_cflags = -O3 -g
+powerpc_includedir = /usr/include/powerpc-linux-gnu
+powerpc_extra_config_options := $(extra_config_options) --disable-profile
powerpc_rtlddir = /lib
powerpc_slibdir = /lib32
powerpc_libdir = /usr/lib32
-powerpc_extra_config_options := $(extra_config_options) --disable-profile \
- --includedir=/usr/include/powerpc-linux-gnu
define libc6-dev-powerpc_extra_pkg_install
mkdir -p debian/libc6-dev-powerpc/usr/include/gnu
cp -af debian/tmp-powerpc/usr/include/powerpc-linux-gnu/gnu/stubs-32.h \
debian/libc6-dev-powerpc/usr/include/gnu
-ln -sf /usr/include/ debian/libc6-dev-powerpc/usr/include/powerpc-linux-gnu
+ln -sf . debian/libc6-dev-powerpc/usr/include/powerpc-linux-gnu
endef
# create a symlink for the 32 bit dynamic linker in /lib
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2007-05-06 11:35:34 UTC (rev 2186)
@@ -6,10 +6,10 @@
s390x_CC = $(CC) -m64
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_cflags = -g -O3
+s390x_extra_config_options := $(extra_config_options) --disable-profile
+s390x_includedir = /usr/include/s390x-linux-gnu
s390x_slibdir = /lib64
s390x_libdir = /usr/lib64
-s390x_extra_config_options := $(extra_config_options) --disable-profile \
- --includedir=/usr/include/s390x-linux-gnu
define libc6-dev-s390x_extra_pkg_install
mkdir -p debian/libc6-dev-s390x/usr/include/gnu
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2007-05-06 10:55:35 UTC (rev 2185)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2007-05-06 11:35:34 UTC (rev 2186)
@@ -6,10 +6,10 @@
sparc64_CC = $(BUILD_CC) -m64
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_extra_cflags = -g -O3
+sparc64_extra_config_options = $(extra_config_options) --disable-profile
+sparc64_includedir = /usr/include/sparc64-linux-gnu
sparc64_slibdir = /lib64
sparc64_libdir = /usr/lib64
-sparc64_extra_config_options = $(extra_config_options) --disable-profile \
- --includedir=/usr/include/sparc64-linux-gnu
define libc6-dev-sparc64_extra_pkg_install
mkdir -p debian/libc6-dev-sparc64/usr/include/gnu
Reply to: