Bug#259302: libc6: patch for lib64 for amd64
At Fri, 17 Dec 2004 17:07:31 +0100,
Goswin Brederlow wrote:
> attached is a patch to add /lib64 and /usr/lib64 symlinks to the libc6
> package for amd64. The unofficial amd64 repository now has
> transitional packages with extra Pre-Depends and Replaces fields for a
> smooth upgrade that can be phased out with the next glibc upload.
Thanks for your patch.
> diff -u glibc-2.3.2.ds1/debian/rules.d/debhelper.mk glibc-2.3.2.ds1/debian/rules.d/debhelper.mk
> --- glibc-2.3.2.ds1/debian/rules.d/debhelper.mk
> +++ glibc-2.3.2.ds1/debian/rules.d/debhelper.mk
> @@ -30,6 +30,10 @@
> install --mode=0644 debian/local/manpages/ld.so.8 debian/$(curpass)/usr/share/man/man8/ld.so.8
>
> install --mode=0644 debian/FAQ debian/$(curpass)/usr/share/doc/$(curpass)/README.Debian
> +#ifeq ($(DEB_BUILD_ARCH),amd64)
> + ln -s lib $(CURDIR)/debian/$(curpass)/lib64
> + ln -s lib $(CURDIR)/debian/$(curpass)/usr/lib64
> +#endif
> endef
>
> define locales_extra_pkg_install
I think debhelper.mk should be independent from architecture related
issue. I move creating symlinks to debian/sysdeps/amd64.mk. However,
the current debhelper.mk does not work to override
libc6_extra_pkg_install because it's already used in debhelper.mk. So
I changed extra_pkg_install in debhelper.mk to
extra_debhelper_pkg_install to fix this issue.
I put this modification to cvs/svn.
Regards,
-- gotom
Index: debian/changelog
===================================================================
--- debian/changelog (revision 845)
+++ debian/changelog (working copy)
@@ -15,6 +15,12 @@
gcc-3.3_3.3.5-4.
- debian/control: Likewise.
+ - debian/sysdeps/amd64.mk: Add /lib64 and /usr/lib64 symlinks which are
+ provided by glibc instead of base-files for amd64. Requested by Goswin
+ Brederlow <brederlo@informatik.uni-tuebingen.de>. (Closes: #259302)
+ - debian/rules.d/debhelper.mk: Replace from extra_pkg_install to
+ extra_debhelper_pkg_install rule which are used for debhelper.mk only.
+
- debian/local/manpages/locale.1: Add the description about
/usr/share/i18n/SUPPORTED. Requested by Guillermo S. Romero
<gsromero@alumnos.euitt.upm.es>. (Closes: #284137)
Index: debian/sysdeps/amd64.mk
===================================================================
--- debian/sysdeps/amd64.mk (revision 844)
+++ debian/sysdeps/amd64.mk (working copy)
@@ -12,3 +12,9 @@
ifeq ($(BUILD_CC_VERSION),3.4)
libc_extra_cflags += -g0
endif
+
+# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
+define libc6_extra_pkg_install
+ln -sf lib debian/$(curpass)/lib64
+ln -sf lib debian/$(curpass)/usr/lib64
+endef
Index: debian/rules.d/debhelper.mk
===================================================================
--- debian/rules.d/debhelper.mk (revision 844)
+++ debian/rules.d/debhelper.mk (working copy)
@@ -17,7 +17,7 @@
install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libresolv.map debian/$(libc)-pic/usr/lib/libresolv_pic.map
# Some per-package extra files to install.
-define $(libc)_extra_pkg_install
+define $(libc)_extra_debhelper_pkg_install
install --mode=0644 $(DEB_SRCDIR)/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
install --mode=0644 $(DEB_SRCDIR)/linuxthreads/README debian/$(curpass)/usr/share/doc/$(curpass)/README.linuxthreads
install --mode=0644 $(DEB_SRCDIR)/linuxthreads/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.linuxthreads
@@ -32,11 +32,11 @@
install --mode=0644 debian/FAQ debian/$(curpass)/usr/share/doc/$(curpass)/README.Debian
endef
-define locales_extra_pkg_install
+define locales_extra_debhelper_pkg_install
install --mode=0644 $(DEB_SRCDIR)/localedata/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
endef
-define glibc-doc_extra_pkg_install
+define glibc-doc_extra_debhelper_pkg_install
install --mode=0644 $(DEB_SRCDIR)/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
install --mode=0644 $(DEB_SRCDIR)/linuxthreads/FAQ.html debian/$(curpass)/usr/share/doc/$(curpass)/FAQ.linuxthreads.html
endef
@@ -64,6 +64,9 @@
dh_installdocs -p$(curpass)
dh_link -p$(curpass)
+ # extra_debhelper_pkg_install is used for debhelper.mk only.
+ # when you want to install extra packages, use extra_pkg_install.
+ $(call xx,extra_debhelper_pkg_install)
$(call xx,extra_pkg_install)
ifeq ($(filter nostrip,$(DEB_BUILD_OPTIONS)),)
Reply to: