Hi, On Thu, 19 Jun 2014 18:43:08 +0300 Peter Pentchev <[email protected]> wrote: > Here's a patch that does this: if we are building in the "stage1" > profile, the configure script is invoked with --disable-* and the rules > file does not build the x264 binary package at all. This still leaves > the build dependencies in the control file; a separate bug will be filed > for that, modifying the control file to add instructions to drop these > dependencies in the stage1 profile. Unfortunately, the Debian archive > infrastructure cannot yet deal with these annotations, so that bug will > most probably have to wait until Jessie is released.
the syntax for the Build-Profiles field was changed during the bootstrap sprint in paris [1,2]. Attached patch is updated to reflect those changes. It only changes debian/control.in so please regenerate debian/control. As the patch requires debhelper to understand the new syntax, this bug is blocked by that bug in debhelper. In contrast to the patch for #752103 (which is marked as block by this bug) this patch does use the new build profile syntax in the Build-Depends field and thus can be applied before Jessie is released. cheers, josch [1] https://wiki.debian.org/Sprints/2014/BootstrapSprint [2] https://wiki.debian.org/BuildProfileSpec
diff -Nru x264-0.142.2431+gita5831aa/debian/changelog x264-0.142.2431+gita5831aa/debian/changelog --- x264-0.142.2431+gita5831aa/debian/changelog 2014-07-11 03:21:53.000000000 +0200 +++ x264-0.142.2431+gita5831aa/debian/changelog 2014-10-07 10:38:08.000000000 +0200 @@ -1,3 +1,21 @@ +x264 (2:0.142.2431+gita5831aa-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * To avoid a circular build dependencies: + - add Build-Profiles field so that only the library is built in the + stage1 build profile + - add --disable-avs --disable-ffms --disable-gpac to common_confflags + when building with stage1 + - depend on the proper versions of debhelper and dpkg-dev for parsing + build profile information in debian/control + Based on patch by Peter Pentchev + Closes: #735742 + + -- Johannes Schauer <[email protected]> Tue, 07 Oct 2014 10:32:26 +0200 + x264 (2:0.142.2431+gita5831aa-1) unstable; urgency=low * Update to new upstream snapshot diff -Nru x264-0.142.2431+gita5831aa/debian/confflags x264-0.142.2431+gita5831aa/debian/confflags --- x264-0.142.2431+gita5831aa/debian/confflags 2014-07-11 03:13:07.000000000 +0200 +++ x264-0.142.2431+gita5831aa/debian/confflags 2014-10-07 10:27:55.000000000 +0200 @@ -20,6 +20,10 @@ common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) +ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES))) +common_confflags += --disable-avs --disable-ffms --disable-gpac +endif + # XXX why isn't --enable-visualize used in the static build? # TODO --disable-asm when we build an opt flavor? static_confflags += \ diff -Nru x264-0.142.2431+gita5831aa/debian/control.in x264-0.142.2431+gita5831aa/debian/control.in --- x264-0.142.2431+gita5831aa/debian/control.in 2014-07-11 03:13:07.000000000 +0200 +++ x264-0.142.2431+gita5831aa/debian/control.in 2014-10-07 10:57:02.000000000 +0200 @@ -6,8 +6,9 @@ Reinhard Tartler <[email protected]>, Fabian Greffrath <[email protected]>, Rico Tzschichholz <[email protected]> +# In the stage1 build profile, drop the libavformat-dev, libffms2-dev and libgpac-dev dependencies. Build-Depends: - debhelper (>= 8.1.3~), + debhelper (>= 9.FIXME), autotools-dev, libavformat-dev (>= 6:9), libffms2-dev, @@ -22,6 +23,7 @@ Package: x264 Section: graphics Architecture: any +Build-Profiles: <!stage1> Depends: ${misc:Depends}, ${shlibs:Depends}
