r1235 - in glibc-package/trunk/debian: . control.in rules.d sysdeps
Author: aurel32
Date: 2006-02-24 16:00:22 +0000 (Fri, 24 Feb 2006)
New Revision: 1235
Added:
glibc-package/trunk/debian/control.in/powerpc
glibc-package/trunk/debian/sysdeps/ppc64.mk
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules.d/control.mk
Log:
* Add support for the ppc64 architecture. (Closes: #301438).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-24 15:18:03 UTC (rev 1234)
+++ glibc-package/trunk/debian/changelog 2006-02-24 16:00:22 UTC (rev 1235)
@@ -3,6 +3,7 @@
[ Aurelien Jarno]
* 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).
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-02-24 15:18:03 UTC (rev 1234)
+++ glibc-package/trunk/debian/control 2006-02-24 16:00:22 UTC (rev 1235)
@@ -8,7 +8,7 @@
kfreebsd-kernel-headers [kfreebsd-i386],
gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], libc6-dev-powerpc [ppc64],
quilt
Build-Depends-Indep: perl, po-debconf
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
@@ -45,7 +45,7 @@
by default. This created a package that unpacked to an excess of 30 megs.
Package: nscd
-Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386
+Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386
Section: admin
Priority: optional
Depends: libc6 (>= ${Source-Version})
@@ -56,7 +56,7 @@
slow Services like LDAP, NIS or NIS+
Package: libc6
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
@@ -67,7 +67,7 @@
Timezone data is also included.
Package: libc6-dev
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: standard
Depends: libc6 (= ${Source-Version})
@@ -77,7 +77,7 @@
and link programs which use the standard C library.
Package: libc6-dbg
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: extra
Provides: libc-dbg
@@ -91,7 +91,7 @@
Most people will not need this package.
Package: libc6-prof
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: extra
Depends: libc6 (= ${Source-Version})
@@ -100,7 +100,7 @@
with gprof.
Package: libc6-pic
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
Conflicts: libc-pic
@@ -115,7 +115,7 @@
Package: libc6-udeb
XC-Package-Type: udeb
-Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: debian-installer
Priority: extra
Provides: libc6, libc-udeb, ${locale-compat:Depends}
@@ -431,6 +431,27 @@
which use the standard C library. This is the 64bit version of the
library, meant for AMD64 systems.
+Package: libc6-powerpc
+Architecture: ppc64
+Section: libs
+Priority: standard
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: 32bit powerpc shared libraries for ppc64
+ This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ This is the 32bit version of the library, meant for ppc64 systems.
+
+Package: libc6-dev-powerpc
+Architecture: ppc64
+Section: libdevel
+Priority: optional
+Provides: lib32c-dev
+Depends: libc6-powerpc (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib32gcc1
+Description: GNU C Library: 32bit powerpc development libraries for ppc64
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the 32bit version of the
+ library, meant for ppc64 systems.
+
Package: libc6-ppc64
Architecture: powerpc
Section: libs
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-02-24 15:18:03 UTC (rev 1234)
+++ glibc-package/trunk/debian/control.in/main 2006-02-24 16:00:22 UTC (rev 1235)
@@ -8,7 +8,7 @@
kfreebsd-kernel-headers [kfreebsd-i386],
gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], libc6-dev-powerpc [ppc64],
quilt
Build-Depends-Indep: perl, po-debconf
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Added: glibc-package/trunk/debian/control.in/powerpc
===================================================================
--- glibc-package/trunk/debian/control.in/powerpc 2006-02-24 15:18:03 UTC (rev 1234)
+++ glibc-package/trunk/debian/control.in/powerpc 2006-02-24 16:00:22 UTC (rev 1235)
@@ -0,0 +1,21 @@
+Package: libc6-powerpc
+Architecture: ppc64
+Section: libs
+Priority: standard
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: 32bit powerpc shared libraries for ppc64
+ This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ This is the 32bit version of the library, meant for ppc64 systems.
+
+Package: libc6-dev-powerpc
+Architecture: ppc64
+Section: libdevel
+Priority: optional
+Provides: lib32c-dev
+Depends: libc6-powerpc (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib32gcc1
+Description: GNU C Library: 32bit powerpc development libraries for ppc64
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the 32bit version of the
+ library, meant for ppc64 systems.
+
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2006-02-24 15:18:03 UTC (rev 1234)
+++ glibc-package/trunk/debian/rules.d/control.mk 2006-02-24 16:00:22 UTC (rev 1235)
@@ -1,10 +1,10 @@
-control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.3 libc0.1 sparc64 s390x ppc64 opt amd64)
+control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390x powerpc ppc64 opt amd64)
-threads_archs := alpha amd64 arm armeb i386 m68k mips mipsel powerpc sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386
+threads_archs := alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386
debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6%g' \
- -e 's%@archs@%amd64 arm armeb i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
+ -e 's%@archs@%amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
debian/control.in/libc6.1: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6.1%g;s%@archs@%alpha ia64%g' < $< > $@
@@ -27,6 +27,7 @@
cat debian/control.in/sparc64 >> $@T
cat debian/control.in/s390x >> $@T
cat debian/control.in/amd64 >> $@T
+ cat debian/control.in/powerpc >> $@T
cat debian/control.in/ppc64 >> $@T
cat debian/control.in/opt >> $@T
cat debian/control.in/libnss-dns-udeb >> $@T
Added: glibc-package/trunk/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/ppc64.mk 2006-02-24 15:18:03 UTC (rev 1234)
+++ glibc-package/trunk/debian/sysdeps/ppc64.mk 2006-02-24 16:00:22 UTC (rev 1235)
@@ -0,0 +1,34 @@
+# build libc with nptl instead of linuxthreads
+libc_MIN_KERNEL_SUPPORTED = 2.6.0
+libc_add-ons = nptl $(add-ons)
+libc_extra_cflags = -O3 -g1
+libc_slibdir = /lib
+libc_libdir = /usr/lib
+libc_rtlddir = /lib64
+
+# /lib64 and /usr/lib64 are provided as symlinks
+define libc6_extra_pkg_install
+ln -sf /lib debian/$(curpass)/lib64
+ln -sf lib debian/$(curpass)/usr/lib64
+endef
+
+# build 32-bit (powerpc) alternative library
+GLIBC_PASSES += powerpc
+DEB_ARCH_REGULAR_PACKAGES += libc6-powerpc libc6-dev-powerpc
+libc6-powerpc_shlib_dep = libc6-powerpc (>= $(shlib_dep_ver))
+
+powerpc_configure_target = powerpc-linux
+powerpc_CC = $(CC) -m32
+powerpc_add-ons = nptl $(add-ons)
+powerpc_extra_cflags = -O3 -g1
+powerpc_rtlddir = /lib
+powerpc_slibdir = /lib32
+powerpc_libdir = /usr/lib32
+powerpc_LIBDIR = 32
+powerpc_MIN_KERNEL_SUPPORTED = 2.6.0
+
+# create a symlink for the 32 bit dynamic linker in /lib
+define libc6-powerpc_extra_pkg_install
+mkdir -p debian/$(curpass)/lib
+ln -s /lib32/ld.so.1 debian/$(curpass)/lib
+endef
Reply to: