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

r5273 - glibc-package/trunk/debian/rules.d



Author: aurel32
Date: 2012-06-03 17:04:17 +0000 (Sun, 03 Jun 2012)
New Revision: 5273

Modified:
   glibc-package/trunk/debian/rules.d/control.mk
Log:
Simplify debian/control generation as a first step to get multiarch
conflicts autogenerated


Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk	2012-06-03 16:10:48 UTC (rev 5272)
+++ glibc-package/trunk/debian/rules.d/control.mk	2012-06-03 17:04:17 UTC (rev 5273)
@@ -1,18 +1,15 @@
-control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390 s390x powerpc ppc64 opt amd64 mipsn32 mips64)
+libc_packages := libc6 libc6.1 libc0.1 libc0.3
+libc0_1_archs := kfreebsd-amd64 kfreebsd-i386
+libc0_3_archs := hurd-i386
+libc6_archs   := amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
+libc6_1_archs := alpha ia64
 
-debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
-	sed -e 's%@libc@%libc6%g' \
-	    -e 's%@archs@%amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
+control_deps := $(wildcard debian/control.in/*) $(addprefix debian/control.in/, $(libc_packages))
 
-debian/control.in/libc6.1: debian/control.in/libc debian/rules.d/control.mk
-	sed -e 's%@libc@%libc6.1%g;s%@archs@%alpha ia64%g' < $< > $@
+$(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debian/control.in/libc debian/rules.d/control.mk
+	sed -e "s%@libc@%$*%g" \
+	    -e "s%@archs@%$($(subst .,_,$*)_archs)%g" < $< > $@
 
-debian/control.in/libc0.3: debian/control.in/libc debian/rules.d/control.mk
-	sed -e 's%@libc@%libc0.3%g;s%@archs@%hurd-i386%g;s/nscd, //' < $< > $@
-
-debian/control.in/libc0.1: debian/control.in/libc debian/rules.d/control.mk
-	sed -e 's%@libc@%libc0.1%g;s%@archs@%kfreebsd-i386 kfreebsd-amd64%g' < $< > $@
-
 debian/control: $(stamp)control
 $(stamp)control: debian/control.in/main $(control_deps) \
 		   debian/rules.d/control.mk


Reply to: