Author: adconrad
Date: 2012-10-26 01:53:59 +0000 (Fri, 26 Oct 2012)
New Revision: 5343
Added:
glibc-package/branches/eglibc-2.16/debian/control.in/armel
glibc-package/branches/eglibc-2.16/debian/control.in/armhf
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/rules.d/control.mk
glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk
Log:
Sync support for armel/armhf biarch packages, but keep it disabled
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 01:43:07 UTC
(rev 5342)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 01:53:59 UTC
(rev 5343)
@@ -359,6 +359,7 @@
previously known-working DEB_STAGE=stage1 support for the time being.
* debian/rules.d/build.mk: If WITH_SYSROOT is passed to debian/rules,
then pass --with-headers=$(WITH_SYSROOT)/$(includedir) to the build.
+ * Sync support for armel/armhf biarch packages, but keep it disabled.
-- Aurelien Jarno <[email protected]> Wed, 25 Jul 2012 23:45:58 +0200
Added: glibc-package/branches/eglibc-2.16/debian/control.in/armel
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control.in/armel
(rev 0)
+++ glibc-package/branches/eglibc-2.16/debian/control.in/armel 2012-10-26
01:53:59 UTC (rev 5343)
@@ -0,0 +1,21 @@
+Package: libc6-armel
+Architecture: armhf
+Section: libs
+Priority: optional
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Description: Embedded GNU C Library: ARM softfp shared libraries for armhf
+ This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ This is the ARM softfp version of the library, meant for armhf systems.
+
+Package: libc6-dev-armel
+Architecture: armhf
+Section: libdevel
+Priority: optional
+Depends: libc6-armel (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
+Recommends: gcc-multilib
+Description: Embedded GNU C Library: ARM softfp development libraries for armhf
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the ARM softfp version of the
+ library, meant for armhf systems.
+
Added: glibc-package/branches/eglibc-2.16/debian/control.in/armhf
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control.in/armhf
(rev 0)
+++ glibc-package/branches/eglibc-2.16/debian/control.in/armhf 2012-10-26
01:53:59 UTC (rev 5343)
@@ -0,0 +1,21 @@
+Package: libc6-armhf
+Architecture: armel
+Section: libs
+Priority: optional
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Description: Embedded GNU C Library: ARM hard float shared libraries for armel
+ This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ This is the ARM hard float version of the library, meant for armel systems.
+
+Package: libc6-dev-armhf
+Architecture: armel
+Section: libdevel
+Priority: optional
+Depends: libc6-armhf (= ${binary:Version}), libc6-dev (= ${binary:Version}),
${misc:Depends}
+Recommends: gcc-multilib
+Description: Embedded GNU C Library: ARM hard float development libraries for
armel
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the ARM hard float version of the
+ library, meant for armel systems.
+
Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/rules.d/control.mk
2012-10-26 01:43:07 UTC (rev 5342)
+++ glibc-package/branches/eglibc-2.16/debian/rules.d/control.mk
2012-10-26 01:53:59 UTC (rev 5343)
@@ -34,6 +34,8 @@
cat debian/control.in/ppc64 >> $@T
cat debian/control.in/mipsn32 >> $@T
cat debian/control.in/mips64 >> $@T
+ cat debian/control.in/armhf >> $@T
+ cat debian/control.in/armel >> $@T
cat debian/control.in/kfreebsd-i386 >> $@T
cat debian/control.in/x32 >> $@T
cat debian/control.in/opt >> $@T
Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk
2012-10-26 01:43:07 UTC (rev 5342)
+++ glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk
2012-10-26 01:53:59 UTC (rev 5343)
@@ -81,6 +81,18 @@
dh_strip -p$(curpass) -Xlibpthread;
\
fi
\
fi
+
+ # ARM archs always use multiarch locations, don't let libc6-dbg conflict
+ if test "$(curpass)" = "$(libc)-dbg"; then
\
+ if test "$(DEB_HOST_ARCH)" = "armel"; then
\
+ rm -rf debian/$(curpass)/usr/lib/debug/lib/arm-linux-gnueabihf;
\
+ rm -rf debian/$(curpass)/usr/lib/debug/usr/lib/arm-linux-gnueabihf;
\
+ fi;
\
+ if test "$(DEB_HOST_ARCH)" = "armhf"; then
\
+ rm -rf debian/$(curpass)/usr/lib/debug/lib/arm-linux-gnueabi;
\
+ rm -rf debian/$(curpass)/usr/lib/debug/usr/lib/arm-linux-gnueabi;
\
+ fi;
\
+ fi
endif
dh_compress -p$(curpass)
@@ -216,7 +228,7 @@
pass="" \
suffix="" \
;; \
- *:/lib32 | *:/lib64 | *:/libx32) \
+ *:/lib32 | *:/lib64 | *:/libx32 | *:/lib/arm-linux-gnueabi*) \
templates="libc libc-dev" \
pass="-alt" \
suffix="-$(curpass)" \
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
