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

r1632 - in glibc-package: branches/glibc-2.4/debian/rules.d trunk/debian/rules.d



Author: aurel32
Date: 2006-06-07 22:43:11 +0000 (Wed, 07 Jun 2006)
New Revision: 1632

Modified:
   glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
   glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Small compile fix for architectures with NPTL pass



Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk	2006-06-07 21:46:20 UTC (rev 1631)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk	2006-06-07 22:43:11 UTC (rev 1632)
@@ -188,8 +188,11 @@
 	  case $$z in \
 	    *.install) \
 	      sed -e "s/^#.*//" -i $$z ; \
+	      if [ -z "$(NPTL)" ] ; then \
+	        sed -i "/^.*nptl.*/d" $$z ; \
+	      fi ; \
 	      if [ $(DEB_HOST_ARCH) != $(DEB_BUILD_ARCH) ]; then \
-	        sed -e "/^.*librpcsvc.a.*/d" $$z ; \
+	        sed -i "/^.*librpcsvc.a.*/d" $$z ; \
 	      fi ; \
 	      ;; \
 	    debian/$(libc).preinst) \

Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk	2006-06-07 21:46:20 UTC (rev 1631)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk	2006-06-07 22:43:11 UTC (rev 1632)
@@ -188,8 +188,11 @@
 	  case $$z in \
 	    *.install) \
 	      sed -e "s/^#.*//" -i $$z ; \
+	      if [ -z "$(NPTL)" ] ; then \
+	        sed -i "/^.*nptl.*/d" $$z ; \
+	      fi ; \
 	      if [ $(DEB_HOST_ARCH) != $(DEB_BUILD_ARCH) ]; then \
-	        sed -e "/^.*librpcsvc.a.*/d" $$z ; \
+	        sed -i "/^.*librpcsvc.a.*/d" $$z ; \
 	      fi ; \
 	      ;; \
 	    debian/$(libc).preinst) \



Reply to: