r1891 - in glibc-package: branches/glibc-2.5/debian branches/glibc-2.5/debian/control.in branches/glibc-2.5/debian/rules.d branches/glibc-2.5/debian/sysdeps trunk/debian trunk/debian/control.in trunk/debian/rules.d trunk/debian/sysdeps
Author: aurel32
Date: 2007-01-04 21:46:46 +0100 (Thu, 04 Jan 2007)
New Revision: 1891
Added:
glibc-package/branches/glibc-2.5/debian/control.in/kfreebsd-i386
glibc-package/trunk/debian/control.in/kfreebsd-i386
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/control
glibc-package/branches/glibc-2.5/debian/control.in/main
glibc-package/branches/glibc-2.5/debian/rules.d/control.mk
glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd-amd64.mk
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
glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
Log:
* Add bi-arch support on kfreebsd-amd64:
- debian/sysdeps/kfreebsd-amd64.mk: New pass for 32-bit glibc
- debian/control.in/main: Add build-depends on libc0.1-dev-i386
- debian/control.in/kfreebsd-i386: add libc0.1-dev-i386 and
libc0.1-i386 packages
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-01-04 20:46:46 UTC (rev 1891)
@@ -236,6 +236,11 @@
* sysdeps/kfreebsd.mk: Link all machine*/ directories to support
new bi-arch headers.
+ * Add bi-arch support on kfreebsd-amd64:
+ - debian/sysdeps/kfreebsd-amd64.mk: New pass for 32-bit glibc
+ - debian/control.in/main: Add build-depends on libc0.1-dev-i386
+ - debian/control.in/kfreebsd-i386: add libc0.1-dev-i386 and
+ libc0.1-i386 packages
-- Aurelien Jarno <aurel32@debian.org> Tue, 2 Jan 2007 03:13:54 +0100
Modified: glibc-package/branches/glibc-2.5/debian/control
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/branches/glibc-2.5/debian/control 2007-01-04 20:46:46 UTC (rev 1891)
@@ -7,8 +7,8 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.1, binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
- lib32ssp0 [amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
+ lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: gcc-4.1 (= 4.1.1-14)
@@ -486,6 +486,27 @@
which use the standard C library. This is the 64bit version of the
library, meant for PowerPC64 systems.
+Package: libc0.1-i386
+Architecture: kfreebsd-amd64
+Section: libs
+Priority: optional
+Depends: libc0.1 (= ${Source-Version})
+Description: GNU C Library: 32bit shared libraries for AMD64
+ 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 AMD64 systems.
+
+Package: libc0.1-dev-i386
+Architecture: kfreebsd-amd64
+Section: libdevel
+Priority: optional
+Provides: lib32c-dev
+Depends: libc0.1-i386 (= ${Source-Version}), libc0.1-dev (= ${Source-Version}), lib32gcc1
+Description: GNU C Library: 32bit development libraries for AMD64
+ 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 AMD64 systems.
+
Package: libc6-sparcv9
Architecture: sparc
Section: libs
Added: glibc-package/branches/glibc-2.5/debian/control.in/kfreebsd-i386
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control.in/kfreebsd-i386 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/branches/glibc-2.5/debian/control.in/kfreebsd-i386 2007-01-04 20:46:46 UTC (rev 1891)
@@ -0,0 +1,21 @@
+Package: libc0.1-i386
+Architecture: kfreebsd-amd64
+Section: libs
+Priority: optional
+Depends: libc0.1 (= ${Source-Version})
+Description: GNU C Library: 32bit shared libraries for AMD64
+ 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 AMD64 systems.
+
+Package: libc0.1-dev-i386
+Architecture: kfreebsd-amd64
+Section: libdevel
+Priority: optional
+Provides: lib32c-dev
+Depends: libc0.1-i386 (= ${Source-Version}), libc0.1-dev (= ${Source-Version}), lib32gcc1
+Description: GNU C Library: 32bit development libraries for AMD64
+ 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 AMD64 systems.
+
Modified: glibc-package/branches/glibc-2.5/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control.in/main 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/branches/glibc-2.5/debian/control.in/main 2007-01-04 20:46:46 UTC (rev 1891)
@@ -7,8 +7,8 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.1, binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
- lib32ssp0 [amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
+ lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: gcc-4.1 (= 4.1.1-14)
Modified: glibc-package/branches/glibc-2.5/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/rules.d/control.mk 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/branches/glibc-2.5/debian/rules.d/control.mk 2007-01-04 20:46:46 UTC (rev 1891)
@@ -35,6 +35,7 @@
cat debian/control.in/amd64 >> $@T
cat debian/control.in/powerpc >> $@T
cat debian/control.in/ppc64 >> $@T
+ cat debian/control.in/kfreebsd-i386 >> $@T
cat debian/control.in/opt >> $@T
cat debian/control.in/libnss-dns-udeb >> $@T
cat debian/control.in/libnss-files-udeb >> $@T
Modified: glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd-amd64.mk 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/branches/glibc-2.5/debian/sysdeps/kfreebsd-amd64.mk 2007-01-04 20:46:46 UTC (rev 1891)
@@ -8,3 +8,29 @@
ln -sf lib debian/$(curpass)/usr/lib64
endef
+# build 32-bit (i386) alternative library
+GLIBC_PASSES += i386
+DEB_ARCH_REGULAR_PACKAGES += libc0.1-i386 libc0.1-dev-i386
+libc0.1-i386_shlib_dep = libc0.1-i386 (>= $(shlib_dep_ver))
+
+i386_configure_target = i486-kfreebsd
+i386_CC = $(CC) -m32
+i386_add-ons = linuxthreads $(add-ons)
+i386_extra_cflags = -march=pentium4 -g1 -O3
+i386_extra_config_options = $(extra_config_options) --includedir=/usr/include/i486-kfreebsd-gnu
+i386_rtlddir = /lib
+i386_slibdir = /lib32
+i386_libdir = /usr/lib32
+i386_MIN_KERNEL_SUPPORTED = 5.4.0
+
+define libc0.1-dev-i386_extra_pkg_install
+mkdir -p debian/libc0.1-dev-i386/usr/include
+cp -af debian/tmp-i386/usr/include/i486-kfreebsd-gnu \
+ debian/libc0.1-dev-i386/usr/include
+endef
+
+define libc0.1-i386_extra_pkg_install
+mkdir -p debian/libc0.1-i386/lib
+ln -sf /lib32/ld.so.1 debian/libc0.1-i386/lib
+ln -sf /lib32 debian/libc0.1-i386/lib32
+endef
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/trunk/debian/changelog 2007-01-04 20:46:46 UTC (rev 1891)
@@ -2,6 +2,11 @@
* sysdeps/kfreebsd.mk: Link all machine*/ directories to support
new bi-arch headers.
+ * Add bi-arch support on kfreebsd-amd64:
+ - debian/sysdeps/kfreebsd-amd64.mk: New pass for 32-bit glibc
+ - debian/control.in/main: Add build-depends on libc0.1-dev-i386
+ - debian/control.in/kfreebsd-i386: add libc0.1-dev-i386 and
+ libc0.1-i386 packages
-- Aurelien Jarno <aurel32@debian.org> Tue, 2 Jan 2007 03:13:54 +0100
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/trunk/debian/control 2007-01-04 20:46:46 UTC (rev 1891)
@@ -7,7 +7,7 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [hurd-i386], gcc-4.1 [!hurd-i386], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: gcc-4.1 (= 4.1.1-14)
@@ -485,6 +485,27 @@
which use the standard C library. This is the 64bit version of the
library, meant for PowerPC64 systems.
+Package: libc0.1-i386
+Architecture: kfreebsd-amd64
+Section: libs
+Priority: optional
+Depends: libc0.1 (= ${Source-Version})
+Description: GNU C Library: 32bit shared libraries for AMD64
+ 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 AMD64 systems.
+
+Package: libc0.1-dev-i386
+Architecture: kfreebsd-amd64
+Section: libdevel
+Priority: optional
+Provides: lib32c-dev
+Depends: libc0.1-i386 (= ${Source-Version}), libc0.1-dev (= ${Source-Version}), lib32gcc1
+Description: GNU C Library: 32bit development libraries for AMD64
+ 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 AMD64 systems.
+
Package: libc6-sparcv9
Architecture: sparc
Section: libs
Added: glibc-package/trunk/debian/control.in/kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/control.in/kfreebsd-i386 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/trunk/debian/control.in/kfreebsd-i386 2007-01-04 20:46:46 UTC (rev 1891)
@@ -0,0 +1,21 @@
+Package: libc0.1-i386
+Architecture: kfreebsd-amd64
+Section: libs
+Priority: optional
+Depends: libc0.1 (= ${Source-Version})
+Description: GNU C Library: 32bit shared libraries for AMD64
+ 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 AMD64 systems.
+
+Package: libc0.1-dev-i386
+Architecture: kfreebsd-amd64
+Section: libdevel
+Priority: optional
+Provides: lib32c-dev
+Depends: libc0.1-i386 (= ${Source-Version}), libc0.1-dev (= ${Source-Version}), lib32gcc1
+Description: GNU C Library: 32bit development libraries for AMD64
+ 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 AMD64 systems.
+
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/trunk/debian/control.in/main 2007-01-04 20:46:46 UTC (rev 1891)
@@ -7,7 +7,7 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [hurd-i386], gcc-4.1 [!hurd-i386], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: gcc-4.1 (= 4.1.1-14)
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/trunk/debian/rules.d/control.mk 2007-01-04 20:46:46 UTC (rev 1891)
@@ -35,6 +35,7 @@
cat debian/control.in/amd64 >> $@T
cat debian/control.in/powerpc >> $@T
cat debian/control.in/ppc64 >> $@T
+ cat debian/control.in/kfreebsd-i386 >> $@T
cat debian/control.in/opt >> $@T
cat debian/control.in/libnss-dns-udeb >> $@T
cat debian/control.in/libnss-files-udeb >> $@T
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2007-01-03 17:09:53 UTC (rev 1890)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd-amd64.mk 2007-01-04 20:46:46 UTC (rev 1891)
@@ -8,3 +8,29 @@
ln -sf lib debian/$(curpass)/usr/lib64
endef
+# build 32-bit (i386) alternative library
+GLIBC_PASSES += i386
+DEB_ARCH_REGULAR_PACKAGES += libc0.1-i386 libc0.1-dev-i386
+libc0.1-i386_shlib_dep = libc0.1-i386 (>= $(shlib_dep_ver))
+
+i386_configure_target = i486-kfreebsd
+i386_CC = $(CC) -m32
+i386_add-ons = linuxthreads $(add-ons)
+i386_extra_cflags = -march=pentium4 -g1 -O3
+i386_extra_config_options = $(extra_config_options) --includedir=/usr/include/i486-kfreebsd-gnu
+i386_rtlddir = /lib
+i386_slibdir = /lib32
+i386_libdir = /usr/lib32
+i386_MIN_KERNEL_SUPPORTED = 5.4.0
+
+define libc0.1-dev-i386_extra_pkg_install
+mkdir -p debian/libc0.1-dev-i386/usr/include
+cp -af debian/tmp-i386/usr/include/i486-kfreebsd-gnu \
+ debian/libc0.1-dev-i386/usr/include
+endef
+
+define libc0.1-i386_extra_pkg_install
+mkdir -p debian/libc0.1-i386/lib
+ln -sf /lib32/ld.so.1 debian/libc0.1-i386/lib
+ln -sf /lib32 debian/libc0.1-i386/lib32
+endef
Reply to: