r4845 - in glibc-package/trunk/debian: . control.in sysdeps
Author: aurel32
Date: 2011-08-04 07:10:45 +0000 (Thu, 04 Aug 2011)
New Revision: 4845
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/mipsn32
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
Log:
* On mips/mipsel, only ship the includes symlinks in libc6-dev-mips64. Add
a dependency to libc6-dev-mips64 in libc6-dev-mipsn32.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-04 07:06:16 UTC (rev 4844)
+++ glibc-package/trunk/debian/changelog 2011-08-04 07:10:45 UTC (rev 4845)
@@ -8,6 +8,8 @@
* Include a symlink for fpu_control in biarch packages. Closes: #635685.
* Update conflicts to libc6-dev in biarch packages to (<< 2.13-14) so that
the directory to symlink conversion is done correctly.
+ * On mips/mipsel, only ship the includes symlinks in libc6-dev-mips64. Add
+ a dependency to libc6-dev-mips64 in libc6-dev-mipsn32.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-sysvshm.diff: Fix shm creation: do not create
Modified: glibc-package/trunk/debian/control.in/mipsn32
===================================================================
--- glibc-package/trunk/debian/control.in/mipsn32 2011-08-04 07:06:16 UTC (rev 4844)
+++ glibc-package/trunk/debian/control.in/mipsn32 2011-08-04 07:10:45 UTC (rev 4845)
@@ -15,7 +15,7 @@
Provides: libn32c-dev
Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
-Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Description: Embedded GNU C Library: n32 Development Libraries for MIPS64
Contains the symlinks and object files needed to compile and link programs
Modified: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2011-08-04 07:06:16 UTC (rev 4844)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2011-08-04 07:10:45 UTC (rev 4845)
@@ -13,20 +13,6 @@
mipsn32_libdir = /usr/lib32
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
-define libc6-dev-mipsn32_extra_pkg_install
-
-mkdir -p debian/libc6-dev-mipsn32/usr/include
-ln -s mips-linux-gnu/bits debian/libc6-dev-mipsn32/usr/include/
-ln -s mips-linux-gnu/gnu debian/libc6-dev-mipsn32/usr/include/
-ln -s mips-linux-gnu/fpu_control.h debian/libc6-dev-mipsn32/usr/include/
-
-mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
-for i in `ls debian/tmp-libc/usr/include/mips-linux-gnu/sys` ; do \
- ln -s ../mips-linux-gnu/sys/$$i debian/libc6-dev-mipsn32/usr/include/sys/$$i ; \
-done
-
-endef
-
# build 64-bit alternative library
EGLIBC_PASSES += mips64
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
Modified: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2011-08-04 07:06:16 UTC (rev 4844)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2011-08-04 07:10:45 UTC (rev 4845)
@@ -13,20 +13,6 @@
mipsn32_libdir = /usr/lib32
mipsn32_extra_config_options := $(extra_config_options) --disable-profile
-define libc6-dev-mipsn32_extra_pkg_install
-
-mkdir -p debian/libc6-dev-mipsn32/usr/include
-ln -s mipsel-linux-gnu/bits debian/libc6-dev-mipsn32/usr/include/
-ln -s mipsel-linux-gnu/gnu debian/libc6-dev-mipsn32/usr/include/
-ln -s mipsel-linux-gnu/fpu_control.h debian/libc6-dev-mipsn32/usr/include/
-
-mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
-for i in `ls debian/tmp-libc/usr/include/mipsel-linux-gnu/sys` ; do \
- ln -s ../mipsel-linux-gnu/sys/$$i debian/libc6-dev-mipsn32/usr/include/sys/$$i ; \
-done
-
-endef
-
# build 64-bit alternative library
EGLIBC_PASSES += mips64
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
Reply to: