updates to NPTL branch in Debian CVS
Here are some updates to the NPTL branch that Jeff Bailey and I
discussed on IRC.
The build process created
debian/control.in/{libc0.3,libc1,libc6,libc6.1}. They were not cleaned
by the clean rule. I don't know if they should be.
debian/debhelper.in/libc-nptl.install: new file, telling debhelper what
it needs to install to NPTL-enabled libc packages.
debian/rules: added kludge to ensure the stamp directory exists, and
ensure that it is cleaned.
debian/rules.d/debhelper.mk:
+ tell debhelper to not "fix" the permissions on the dynamic loader
+ fix cut-n-paste error in libc-nptl package generation
debian/sysdeps/ia64.mk: enable NPTL build in GLIBC_PASSES
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc0.3 glibc-2.3.2.for-diffing/debian/control.in/libc0.3
--- glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc0.3 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/control.in/libc0.3 2003-09-30 19:38:04.000000000 -0500
@@ -0,0 +1,56 @@
+Package: libc0.3
+Architecture: hurd-i386
+Section: base
+Priority: required
+Description: GNU C Library: Shared libraries and Timezone data
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ Timezone data is also included.
+
+Package: libc0.3-dev
+Architecture: hurd-i386
+Section: libdevel
+Priority: standard
+Depends: libc0.3 (= ${Source-Version})
+Recommends: c-compiler
+Description: GNU C Library: Development Libraries and Header Files.
+ Contains the symlinks, headers, and object files needed to compile
+ and link programs which use the standard C library.
+
+Package: libc0.3-dbg
+Architecture: hurd-i386
+Section: libdevel
+Priority: extra
+Depends: libc0.3 (= ${Source-Version})
+Description: GNU C Library: Libraries with debugging symbols
+ Contains unstripped shared libraries.
+ This package is provided primarily to provide a backtrace with
+ names in a debugger, this makes it somewhat easier to interpret core
+ dumps. The libraries are installed in /usr/lib/debug and can be
+ used by placing that directory in LD_LIBRARY_PATH.
+ Most people will not need this package.
+
+Package: libc0.3-prof
+Architecture: hurd-i386
+Section: libdevel
+Priority: extra
+Depends: libc0.3 (= ${Source-Version})
+Description: GNU C Library: Profiling Libraries.
+ Static libraries compiled with profiling info (-pg) suitable for use
+ with gprof.
+
+Package: libc0.3-pic
+Architecture: hurd-i386
+Section: libdevel
+Priority: optional
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc0.3 (= ${Source-Version})
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used on the Debian
+ boot floppies. If you are not making your own set of Debian boot floppies
+ using the `boot-floppies' package, you probably don't need this package.
+
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc1 glibc-2.3.2.for-diffing/debian/control.in/libc1
--- glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc1 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/control.in/libc1 2003-09-30 19:38:04.000000000 -0500
@@ -0,0 +1,56 @@
+Package: libc1
+Architecture: freebsd-i386
+Section: base
+Priority: required
+Description: GNU C Library: Shared libraries and Timezone data
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ Timezone data is also included.
+
+Package: libc1-dev
+Architecture: freebsd-i386
+Section: libdevel
+Priority: standard
+Depends: libc1 (= ${Source-Version})
+Recommends: c-compiler
+Description: GNU C Library: Development Libraries and Header Files.
+ Contains the symlinks, headers, and object files needed to compile
+ and link programs which use the standard C library.
+
+Package: libc1-dbg
+Architecture: freebsd-i386
+Section: libdevel
+Priority: extra
+Depends: libc1 (= ${Source-Version})
+Description: GNU C Library: Libraries with debugging symbols
+ Contains unstripped shared libraries.
+ This package is provided primarily to provide a backtrace with
+ names in a debugger, this makes it somewhat easier to interpret core
+ dumps. The libraries are installed in /usr/lib/debug and can be
+ used by placing that directory in LD_LIBRARY_PATH.
+ Most people will not need this package.
+
+Package: libc1-prof
+Architecture: freebsd-i386
+Section: libdevel
+Priority: extra
+Depends: libc1 (= ${Source-Version})
+Description: GNU C Library: Profiling Libraries.
+ Static libraries compiled with profiling info (-pg) suitable for use
+ with gprof.
+
+Package: libc1-pic
+Architecture: freebsd-i386
+Section: libdevel
+Priority: optional
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc1 (= ${Source-Version})
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used on the Debian
+ boot floppies. If you are not making your own set of Debian boot floppies
+ using the `boot-floppies' package, you probably don't need this package.
+
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc6 glibc-2.3.2.for-diffing/debian/control.in/libc6
--- glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc6 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/control.in/libc6 2003-09-30 19:38:04.000000000 -0500
@@ -0,0 +1,56 @@
+Package: libc6
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Section: base
+Priority: required
+Description: GNU C Library: Shared libraries and Timezone data
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ Timezone data is also included.
+
+Package: libc6-dev
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Section: libdevel
+Priority: standard
+Depends: libc6 (= ${Source-Version})
+Recommends: c-compiler
+Description: GNU C Library: Development Libraries and Header Files.
+ Contains the symlinks, headers, and object files needed to compile
+ and link programs which use the standard C library.
+
+Package: libc6-dbg
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Section: libdevel
+Priority: extra
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: Libraries with debugging symbols
+ Contains unstripped shared libraries.
+ This package is provided primarily to provide a backtrace with
+ names in a debugger, this makes it somewhat easier to interpret core
+ dumps. The libraries are installed in /usr/lib/debug and can be
+ used by placing that directory in LD_LIBRARY_PATH.
+ Most people will not need this package.
+
+Package: libc6-prof
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Section: libdevel
+Priority: extra
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: Profiling Libraries.
+ Static libraries compiled with profiling info (-pg) suitable for use
+ with gprof.
+
+Package: libc6-pic
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Section: libdevel
+Priority: optional
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used on the Debian
+ boot floppies. If you are not making your own set of Debian boot floppies
+ using the `boot-floppies' package, you probably don't need this package.
+
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc6.1 glibc-2.3.2.for-diffing/debian/control.in/libc6.1
--- glibc-debian-cvs.for-diffing/glibc-package/debian/control.in/libc6.1 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/control.in/libc6.1 2003-09-30 19:38:04.000000000 -0500
@@ -0,0 +1,56 @@
+Package: libc6.1
+Architecture: alpha ia64
+Section: base
+Priority: required
+Description: GNU C Library: Shared libraries and Timezone data
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ Timezone data is also included.
+
+Package: libc6.1-dev
+Architecture: alpha ia64
+Section: libdevel
+Priority: standard
+Depends: libc6.1 (= ${Source-Version})
+Recommends: c-compiler
+Description: GNU C Library: Development Libraries and Header Files.
+ Contains the symlinks, headers, and object files needed to compile
+ and link programs which use the standard C library.
+
+Package: libc6.1-dbg
+Architecture: alpha ia64
+Section: libdevel
+Priority: extra
+Depends: libc6.1 (= ${Source-Version})
+Description: GNU C Library: Libraries with debugging symbols
+ Contains unstripped shared libraries.
+ This package is provided primarily to provide a backtrace with
+ names in a debugger, this makes it somewhat easier to interpret core
+ dumps. The libraries are installed in /usr/lib/debug and can be
+ used by placing that directory in LD_LIBRARY_PATH.
+ Most people will not need this package.
+
+Package: libc6.1-prof
+Architecture: alpha ia64
+Section: libdevel
+Priority: extra
+Depends: libc6.1 (= ${Source-Version})
+Description: GNU C Library: Profiling Libraries.
+ Static libraries compiled with profiling info (-pg) suitable for use
+ with gprof.
+
+Package: libc6.1-pic
+Architecture: alpha ia64
+Section: libdevel
+Priority: optional
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc6.1 (= ${Source-Version})
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used on the Debian
+ boot floppies. If you are not making your own set of Debian boot floppies
+ using the `boot-floppies' package, you probably don't need this package.
+
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/debhelper.in/libc-nptl.install glibc-2.3.2.for-diffing/debian/debhelper.in/libc-nptl.install
--- glibc-debian-cvs.for-diffing/glibc-package/debian/debhelper.in/libc-nptl.install 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/debhelper.in/libc-nptl.install 2003-10-01 10:10:03.000000000 -0500
@@ -0,0 +1 @@
+debian/tmp-nptl/lib/*.so* lib/nptl
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/rules glibc-2.3.2.for-diffing/debian/rules
--- glibc-debian-cvs.for-diffing/glibc-package/debian/rules 2003-09-27 18:25:39.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/rules 2003-09-30 17:05:34.000000000 -0500
@@ -30,6 +30,7 @@
# limitations, they can be overridden and spread all over.
build-tree := build-tree
stamp := $(CURDIR)/stamp-dir/
+DUMMY := $(shell mkdir -p $(stamp))
# Beyond here you shouldn't need to customise anything:
@@ -116,7 +117,7 @@
clean:: debhelper-clean
rm -rf $(patsubst %,debian/tmp-%,$(GLIBC_PASSES))
rm -rf $(build-tree)
- rm -rf $(stamp)*
+ rm -rf $(stamp)
rm -f log-*
rm -f linux-kernel-headers/include/asm
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/rules.d/debhelper.mk glibc-2.3.2.for-diffing/debian/rules.d/debhelper.mk
--- glibc-debian-cvs.for-diffing/glibc-package/debian/rules.d/debhelper.mk 2003-09-27 18:25:39.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/rules.d/debhelper.mk 2003-10-01 10:06:50.000000000 -0500
@@ -17,7 +17,7 @@
fi
dh_compress -p$(curpass)
- dh_fixperms -p$(curpass)
+ dh_fixperms -p$(curpass) -X ld-
dh_makeshlibs -p$(curpass)
dh_installdeb -p$(curpass)
@@ -60,7 +60,7 @@
for x in $(NPTL); do \
z=debian/$(libc).install; \
- cat debian/debhelper.in/libc-opt.install >>$$z; \
+ cat debian/debhelper.in/libc-nptl.install >>$$z; \
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
sed -e "s#DESTLIBDIR#$$x#" -i $$z; \
diff -urN glibc-debian-cvs.for-diffing/glibc-package/debian/sysdeps/ia64.mk glibc-2.3.2.for-diffing/debian/sysdeps/ia64.mk
--- glibc-debian-cvs.for-diffing/glibc-package/debian/sysdeps/ia64.mk 2003-09-22 16:20:58.000000000 -0500
+++ glibc-2.3.2.for-diffing/debian/sysdeps/ia64.mk 2003-09-30 17:05:37.000000000 -0500
@@ -1 +1,3 @@
+GLIBC_PASSES += nptl
+
libc = libc6.1
--
Branden Robinson | GPG signed/encrypted mail welcome
branden@progeny.com | 1024D/9C0BCBFB
Progeny Linux Systems | D5F6 D4C9 E25B 3D37 068C
| 72E8 0F42 191A 9C0B CBFB
Reply to: