[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#213503: Fixed patch (knetbsd-gnu)



tag 213503 patch
thanks

Hi,

After some off-list clarification by Jeff, I could finish my patch. Here's
the revised version which also fixes Build-Dependencies for kfreebsd-gnu.

It's differed against current CVS, btw.

-- 
Robert Millan

"[..] but the delight and pride of Aule is in the deed of making, and in the
thing made, and neither in possession nor in his own mastery; wherefore he
gives and hoards not, and is free from care, passing ever on to some new work."

 -- J.R.R.T, Ainulindale (Silmarillion)
diff -Nur glibc-package.old/debian/control glibc-package/debian/control
--- glibc-package.old/debian/control	2003-09-12 18:08:48.000000000 +0000
+++ glibc-package/debian/control	2003-10-09 15:14:36.000000000 +0000
@@ -218,7 +218,7 @@
  using the `boot-floppies' package, you probably don't need this package.
 
 Package: libc1
-Architecture: freebsd-i386
+Architecture: freebsd-i386 netbsd-i386
 Section: base
 Priority: required
 Description: GNU C Library: Shared libraries and Timezone data
@@ -228,7 +228,7 @@
  Timezone data is also included.
 
 Package: libc1-dev
-Architecture: freebsd-i386
+Architecture: freebsd-i386 netbsd-i386
 Section: libdevel
 Priority: standard
 Depends: libc1 (= ${Source-Version})
@@ -238,7 +238,7 @@
  and link programs which use the standard C library.
 
 Package: libc1-dbg
-Architecture: freebsd-i386
+Architecture: freebsd-i386 netbsd-i386
 Section: libdevel
 Priority: extra
 Depends: libc1 (= ${Source-Version})
@@ -251,7 +251,7 @@
  Most people will not need this package.
 
 Package: libc1-prof
-Architecture: freebsd-i386
+Architecture: freebsd-i386 netbsd-i386
 Section: libdevel
 Priority: extra
 Depends: libc1 (= ${Source-Version})
@@ -260,7 +260,7 @@
  with gprof.
 
 Package: libc1-pic
-Architecture: freebsd-i386
+Architecture: freebsd-i386 netbsd-i386
 Section: libdevel
 Priority: optional
 Conflicts: libc-pic
diff -Nur glibc-package.old/debian/control.in/main glibc-package/debian/control.in/main
--- glibc-package.old/debian/control.in/main	2003-09-17 19:46:10.000000000 +0000
+++ glibc-package/debian/control.in/main	2003-10-09 15:18:46.000000000 +0000
@@ -1,7 +1,7 @@
 Source: @glibc@
 Section: libs
 Priority: required
-Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386], kernel-headers-2.4.19 (>= 2.4.19-4) [arm], kernel-headers-2.4.20-m68k (>= 2.4.20-1) [m68k], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3, autoconf, binutils (>= 2.14.90.0.5) [!s390], binutils (>= 2.13.90.0.4-1) [s390], sed (>= 4.0.5-4), gawk
+Build-Depends: gettext (>= 0.10.37-1), make (>= 3.78-4), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), kernel-headers-2.4 [!hurd-i386 !freebsd-i386 !netbsd-i386], kernel-headers-2.4.19 (>= 2.4.19-4) [arm], kernel-headers-2.4.20-m68k (>= 2.4.20-1) [m68k], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3, autoconf, binutils (>= 2.14.90.0.5) [!s390], binutils (>= 2.13.90.0.4-1) [s390], sed (>= 4.0.5-4), gawk
 Build-Depends-Indep: perl, latex2html, po-debconf
 Build-Conflicts: kernel-headers-2.4.20-sparc [!sparc], kernel-headers-2.4.21-sparc [!sparc]
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
diff -Nur glibc-package.old/debian/rules.d/control.mk glibc-package/debian/rules.d/control.mk
--- glibc-package.old/debian/rules.d/control.mk	2003-06-18 19:45:52.000000000 +0000
+++ glibc-package/debian/rules.d/control.mk	2003-10-09 15:13:23.000000000 +0000
@@ -13,7 +13,7 @@
 	sed -e 's%@libc@%libc0.3%g;s%@archs@%hurd-i386%g;s/nscd, //' < $< > $@
 
 debian/control.in/libc1: debian/control.in/libc debian/rules.d/control.mk
-	sed -e 's%@libc@%libc1%g;s%@archs@%freebsd-i386%g' < $< > $@
+	sed -e 's%@libc@%libc1%g;s%@archs@%freebsd-i386 netbsd-i386%g' < $< > $@
 
 debian/control: debian/control.in/main $(DEB_HOST_GNU_TYPE) $(control_deps) \
 		   debian/sysdeps/soname.mk debian/sysdeps/config.mk \
diff -Nur glibc-package.old/debian/sysdeps/knetbsd-gnu.mk glibc-package/debian/sysdeps/knetbsd-gnu.mk
--- glibc-package.old/debian/sysdeps/knetbsd-gnu.mk	1970-01-01 00:00:00.000000000 +0000
+++ glibc-package/debian/sysdeps/knetbsd-gnu.mk	2003-10-09 15:12:02.000000000 +0000
@@ -0,0 +1,5 @@
+threads = no
+config-os = knetbsd-gnu
+add-ons = 
+NO_TEST = yes
+extra_config_options := 
diff -Nur glibc-package.old/debian/sysdeps/soname.mk glibc-package/debian/sysdeps/soname.mk
--- glibc-package.old/debian/sysdeps/soname.mk	2003-09-09 04:55:55.000000000 +0000
+++ glibc-package/debian/sysdeps/soname.mk	2003-10-09 15:12:02.000000000 +0000
@@ -1,19 +1,20 @@
-# alpha-linux uses 6.1 as libc's soname
-ifeq ($(DEB_HOST_GNU_TYPE),alpha-linux)
-  libc = libc6.1
-else
-  ifeq ($(DEB_HOST_GNU_TYPE),ia64-linux)
+ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
+  ifeq ($(DEB_HOST_GNU_CPU),alpha)
     libc = libc6.1
   else
-    # libc0.3 for hurd
-    ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
-      libc = libc0.3
+    ifeq ($(DEB_HOST_GNU_CPU),ia64)
+      libc = libc6.1
     else
-      ifeq ($(DEB_HOST_GNU_SYSTEM),kfreebsd-gnu)
-        libc = libc1
-      else
-        libc = libc6
-      endif
+      libc = libc6
     endif
   endif
 endif
+ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
+  libc = libc0.3
+endif
+ifeq ($(DEB_HOST_GNU_SYSTEM),kfreebsd-gnu)
+  libc = libc1
+endif
+ifeq ($(DEB_HOST_GNU_SYSTEM),knetbsd-gnu)
+  libc = libc1
+endif

Reply to: