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

r5413 - in glibc-package/branches/eglibc-2.16/debian: . debhelper.in rules.d



Author: adconrad
Date: 2012-11-26 01:17:54 +0000 (Mon, 26 Nov 2012)
New Revision: 5413

Added:
   glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.postinst
Modified:
   glibc-package/branches/eglibc-2.16/debian/changelog
   glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.preinst
   glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk
Log:
* debian/debhelper.in/libc-dev-alt.{preinst,postinst}: Do the directory to
  symlink migration in postinst, which solves issues with dpkg following
  the new symlink on unpack and removing all the "old" (now new) files.
* debian/rules.d/debhelper.mk: Add a MULTIARCHDIR subst for the above.

Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog	2012-11-25 20:55:08 UTC (rev 5412)
+++ glibc-package/branches/eglibc-2.16/debian/changelog	2012-11-26 01:17:54 UTC (rev 5413)
@@ -5,6 +5,10 @@
     with my C++ header detection patch on glibc trunk, for g++-4.7_4.7.2-10.
   * Add patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff to fix builds on
     PowerPC against linux headers from 3.7-rc.  Remove if fixed for 3.7-final.
+  * debian/debhelper.in/libc-dev-alt.{preinst,postinst}: Do the directory to
+    symlink migration in postinst, which solves issues with dpkg following
+    the new symlink on unpack and removing all the "old" (now new) files.
+  * debian/rules.d/debhelper.mk: Add a MULTIARCHDIR subst for the above.
   * debian/sysdeps/{amd64,i386}.mk: Enable and bootstrap x32 multilib builds.
   * debian/control.in/main: Bump g++4.7 build-dep to 4.7.2-11 for x32 builds.
   * debian/control.in/main: Bump linux-libc-dev build-dep for alt x32 builds.

Added: glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.postinst
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.postinst	                        (rev 0)
+++ glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.postinst	2012-11-26 01:17:54 UTC (rev 5413)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+	(configure)
+	# We want /usr/include/bits and /usr/include/gnu to become
+	# symlinks, but only after succesfully unpacking libc6-dev-alt
+	if ! test -h /usr/include/bits ; then
+		rm -rf /usr/include/bits
+		ln -sf MULTIARCHDIR/bits /usr/include/
+	fi
+	if ! test -h /usr/include/gnu ; then
+		rm -rf /usr/include/gnu
+		ln -sf MULTIARCHDIR/gnu /usr/include/
+	fi
+	;;
+	(*)
+	;;
+esac

Modified: glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.preinst
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.preinst	2012-11-25 20:55:08 UTC (rev 5412)
+++ glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc-dev-alt.preinst	2012-11-26 01:17:54 UTC (rev 5413)
@@ -4,15 +4,6 @@
 
 case $1 in
 	(upgrade|install)
-	# We want /usr/include/bits and /usr/include/gnu to become
-	# symlinks
-	if ! test -h /usr/include/bits ; then
-		rm -rf /usr/include/bits
-	fi
-	if ! test -h /usr/include/gnu ; then
-		rm -rf /usr/include/gnu
-	fi
-
 	# We want /usr/include/sys to be a normal directory instead
 	# of a symlink
 	if test -h /usr/include/sys ; then

Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk	2012-11-25 20:55:08 UTC (rev 5412)
+++ glibc-package/branches/eglibc-2.16/debian/rules.d/debhelper.mk	2012-11-26 01:17:54 UTC (rev 5413)
@@ -251,6 +251,7 @@
 	    sed -e "s#LIBDIR#$$libdir#g" -i $$t; \
 	    sed -e "s#FLAVOR#$$curpass#g" -i $$t; \
 	    sed -e "s#RTLD_SO#$$rtld_so#g" -i $$t ; \
+	    sed -e "s#MULTIARCHDIR#$$DEB_HOST_MULTIARCH#g" -i $$t ; \
 	  done ; \
 	done
 endif


Reply to: