r1945 - in glibc-package/branches/glibc-2.5/debian: . sysdeps
Author: aurel32
Date: 2007-02-07 08:03:14 +0100 (Wed, 07 Feb 2007)
New Revision: 1945
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/sysdeps/ppc64.mk
glibc-package/branches/glibc-2.5/debian/sysdeps/s390.mk
Log:
* sysdeps/ppc64.mk: install 32-bit headers (actually gnu/stubs-32.h)
directly into /usr/include and provide /usr/include/powerpc-linux-gnu as
a symlink to /usr/include for compatibility reasons.
* sysdeps/s390.mk: install 64-bit headers (actually gnu/stubs-64.h)
directly into /usr/include and provide /usr/include/s390x-linux-gnu as
a symlink to /usr/include for compatibility reasons.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-07 06:53:04 UTC (rev 1944)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-07 07:03:14 UTC (rev 1945)
@@ -36,6 +36,9 @@
* sysdeps/powerpc.mk: install 64-bit headers (actually gnu/stubs-64.h)
directly into /usr/include and provide /usr/include/powerpc64-linux-gnu as
a symlink to /usr/include for compatibility reasons. Closes: #391858.
+ * sysdeps/ppc64.mk: install 32-bit headers (actually gnu/stubs-32.h)
+ directly into /usr/include and provide /usr/include/powerpc-linux-gnu as
+ a symlink to /usr/include for compatibility reasons.
* kfreebsd/local-scripts.diff: update.
* kfreebsd/local-sys_queue_h.diff: update.
* kfreebsd/local-sysdeps.diff: update to revision 1689 (from glibc-bsd).
@@ -90,6 +93,9 @@
* debhelper.in/locales.templates: recommends UTF-8 locales by default.
* control.in/main, rules.d/debhelper.mk: use dh_shlibdeps to set the
dependencies of nscd. Closes: #409288.
+ * sysdeps/s390.mk: install 64-bit headers (actually gnu/stubs-64.h)
+ directly into /usr/include and provide /usr/include/s390x-linux-gnu as
+ a symlink to /usr/include for compatibility reasons.
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.5/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/sysdeps/ppc64.mk 2007-02-07 06:53:04 UTC (rev 1944)
+++ glibc-package/branches/glibc-2.5/debian/sysdeps/ppc64.mk 2007-02-07 07:03:14 UTC (rev 1945)
@@ -20,7 +20,16 @@
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
+endef
+
# create a symlink for the 32 bit dynamic linker in /lib
define libc6-powerpc_extra_pkg_install
mkdir -p debian/$(curpass)/lib
Modified: glibc-package/branches/glibc-2.5/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/sysdeps/s390.mk 2007-02-07 06:53:04 UTC (rev 1944)
+++ glibc-package/branches/glibc-2.5/debian/sysdeps/s390.mk 2007-02-07 07:03:14 UTC (rev 1945)
@@ -8,8 +8,16 @@
s390x_extra_cflags = -g -O3
s390x_slibdir = /lib64
s390x_libdir = /usr/lib64
-s390x_extra_config_options := $(extra_config_options) --disable-profile
+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
+cp -af debian/tmp-s390x/usr/include/s390x-linux-gnu/gnu/stubs-64.h \
+ debian/libc6-dev-s390x/usr/include/gnu
+ln -sf /usr/include/ debian/libc6-dev-s390x/usr/include/s390x-linux-gnu
+endef
+
define libc6-s390x_extra_pkg_install
mkdir -p debian/$(curpass)/lib
ln -s /lib64/ld64.so.1 debian/$(curpass)/lib
Reply to: