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

r3068 - glibc-package/branches/glibc-2.8/debian/rules.d



Author: aurel32
Date: 2008-08-09 22:08:48 +0000 (Sat, 09 Aug 2008)
New Revision: 3068

Modified:
   glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk
Log:
Fix patch/unpatch rules for architectures specific


Modified: glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk	2008-08-09 22:06:14 UTC (rev 3067)
+++ glibc-package/branches/glibc-2.8/debian/rules.d/quilt.mk	2008-08-09 22:08:48 UTC (rev 3068)
@@ -13,9 +13,9 @@
 	  pc=".pc.$(DEB_HOST_ARCH)"; \
 	  mkdir -p "$$pc"; \
 	  ln -sf ../debian/patches/series.$(DEB_HOST_ARCH) $$pc/series; \
+	  QUILT_PC="$$pc" $(QUILT) upgrade || true; \
 	  if QUILT_PC="$$pc" $(QUILT) next >/dev/null 2>&1; then \
 	    echo "Applying architecture specific patches... "; \
-	    QUILT_PC="$$pc" $(QUILT) upgrade || true; \
 	    QUILT_PC="$$pc" $(QUILT) push -a -v ; \
 	  fi ; \
 	fi ; \
@@ -33,9 +33,9 @@
 	rm -rf .pc ; \
 	if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
 	  pc=".pc.$(DEB_HOST_ARCH)"; \
+	  QUILT_PC="$$pc" $(QUILT) upgrade || true; \
 	  if QUILT_PC="$$pc" $(QUILT) previous >/dev/null 2>&1; then \
 	    echo "Unapplying architecture specific patches..."; \
-	    QUILT_PC="$$pc" $(QUILT) upgrade || true; \
 	    QUILT_PC="$$pc" $(QUILT) pop -a -v ; \
 	  fi ; \
 	  rm -rf $$pc ; \


Reply to: