Author: aurel32
Date: 2009-09-04 12:08:15 +0000 (Fri, 04 Sep 2009)
New Revision: 3796
Modified:
glibc-package/branches/multiarch/debian/rules
glibc-package/branches/multiarch/debian/rules.d/build.mk
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
Log:
Use real depends between the targets
Modified: glibc-package/branches/multiarch/debian/rules
===================================================================
--- glibc-package/branches/multiarch/debian/rules 2009-09-03 12:53:42 UTC
(rev 3795)
+++ glibc-package/branches/multiarch/debian/rules 2009-09-04 12:08:15 UTC
(rev 3796)
@@ -164,12 +164,9 @@
# Required Debian targets
binary-indep: build testroot debian/control $(build-tree) \
- $(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES)) \
$(patsubst %,$(stamp)binaryinst_%,$(DEB_INDEP_REGULAR_PACKAGES))
-# NOTE: Putting install_ stamps before binaryinst_ stamps in the list is the
-# wrong way to represent dependencies. Fix this.
+
binary-arch: build testroot debian/control $(build-tree) \
- $(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES)) \
$(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES)) \
$(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES))
Modified: glibc-package/branches/multiarch/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-03
12:53:42 UTC (rev 3795)
+++ glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-09-04
12:08:15 UTC (rev 3796)
@@ -162,5 +162,3 @@
-f $(build-tree)/eglibc-$(EGLIBC_VERSION).tar.lzma \
$(EGLIBC_SOURCES)
touch $@
-
-.NOTPARALLEL: $(patsubst %,install_%,$(EGLIBC_PASSES))
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
2009-09-03 12:53:42 UTC (rev 3795)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
2009-09-04 12:08:15 UTC (rev 3796)
@@ -32,7 +32,7 @@
non-debug-packages = $(filter-out %-dbg,$(DEB_ARCH_REGULAR_PACKAGES))
$(patsubst %,$(stamp)binaryinst_%,$(debug-packages)):: $(patsubst
%,$(stamp)binaryinst_%,$(non-debug-packages))
-$(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES)
$(DEB_INDEP_REGULAR_PACKAGES)):: $(stamp)debhelper
+$(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES)
$(DEB_INDEP_REGULAR_PACKAGES)):: $(patsubst
%,$(stamp)install_%,$(EGLIBC_PASSES)) $(stamp)debhelper
@echo Running debhelper for $(curpass)
dh_testroot
dh_installdirs -p$(curpass)
@@ -112,7 +112,7 @@
touch $@
$(patsubst %,binaryinst_%,$(DEB_UDEB_PACKAGES)) :: binaryinst_% :
$(stamp)binaryinst_%
-$(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES)): $(stamp)debhelper
+$(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES)): $(stamp)debhelper
$(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES))
@echo Running debhelper for $(curpass)
dh_testroot
dh_installdirs -p$(curpass)
@@ -139,7 +139,7 @@
OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
debhelper: $(stamp)debhelper
-$(stamp)debhelper:
+$(stamp)debhelper: $(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES))
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
y=debian/`basename $$x`; \
z=`echo $$y | sed -e
's#libc\(\|-alt\|-dev\|-dev-alt\|-otherbuild\|-pic\|-prof\|-udeb\)\.#$(libc)\1.#g'`;
\
@@ -165,7 +165,6 @@
sed -e "s#RTLD#$$rtld#" -e "s#C_SO#$$c_so#" -e "s#M_SO#$$m_so#"
-e "s#PTHREAD_SO#$$pthread_so#" -e "s#RT_SO#$$rt_so#" -e "s#DL_SO#$$dl_so#" -i
$$z ; \
;; \
esac; \
-
done
# Hack: special-case passes whose destdir is a biarch directory
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
