Author: barbier
Date: 2006-01-15 00:03:24 +0000 (Sun, 15 Jan 2006)
New Revision: 1101
Added:
glibc-package/trunk/debian/patches/series.amd64
Modified:
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/rules.d/quilt.mk
Log:
amd64-lib.diff has to be applied only on amd64, thus add
support for architecture-specific patches.
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-01-13 20:35:42 UTC (rev
1100)
+++ glibc-package/trunk/debian/patches/series 2006-01-15 00:03:24 UTC (rev
1101)
@@ -46,7 +46,6 @@
90_glibc233_tcsetaddr.diff -p1
localedef-fix-trampoline.diff -p1
#translation-fr - translation maintainer currently reject this patch 2004-04-21
-amd64-lib.diff -p1
localedata/locale-eu_FR.diff -p0
glibc232-m68k-reloc.diff -p1
#glibc232-globfree-clear.diff -p1 # g: suspended
Added: glibc-package/trunk/debian/patches/series.amd64
===================================================================
--- glibc-package/trunk/debian/patches/series.amd64 2006-01-13 20:35:42 UTC
(rev 1100)
+++ glibc-package/trunk/debian/patches/series.amd64 2006-01-15 00:03:24 UTC
(rev 1101)
@@ -0,0 +1,2 @@
+amd64-lib.diff -p1
+
Modified: glibc-package/trunk/debian/rules.d/quilt.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/quilt.mk 2006-01-13 20:35:42 UTC (rev
1100)
+++ glibc-package/trunk/debian/rules.d/quilt.mk 2006-01-15 00:03:24 UTC (rev
1101)
@@ -24,10 +24,19 @@
# in their $HOME/.quiltrc
# These symbolic links are useful when running quilt interactively
# from $(DEB_SRCDIR), or from the patch/unpatch targets.
+# Patches specific to a certain architecture are applied first.
quilt:
@if test -n "$(DEB_SRCDIR)" && test -d $(DEB_SRCDIR); then \
test -L $(DEB_SRCDIR)/debian || ln -s . $(DEB_SRCDIR)/debian; \
test -L $(DEB_SRCDIR)/patches || ln -s $(shell pwd)/debian/patches
$(DEB_SRCDIR)/patches; \
+ if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
+ pc=".pc.$(DEB_HOST_ARCH)"; \
+ test -d "$(DEB_SRCDIR)/$$pc" || mkdir "$(DEB_SRCDIR)/$$pc"; \
+ cp debian/patches/series.$(DEB_HOST_ARCH)
$(DEB_SRCDIR)/$$pc/series; \
+ cd $(DEB_SRCDIR); \
+ QUILT_PC="$$pc" quilt upgrade || true; \
+ QUILT_PC="$$pc" quilt push -a || true; \
+ fi; \
fi
unpatch: quilt
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
