On Wed, May 28, 2014 at 11:51:07AM +0300, Peter Pentchev wrote:
On Tue, May 27, 2014 at 11:01:20AM +0300, Peter Pentchev wrote:
Source: flex
Severity: wishlist
Tags: patch
Hi,
As noted in #749344, here's the follow-up patch that modifies the
control file with build profiles support. Of course, applying it will
have to wait until #744246 is resolved (actual build infrastructure
support for build profiles), until then an uploaded package would fail
to build.
Hi,
And here's an updated patch:
- rebased onto the current master branch after the release of flex-2.5.39-7
- only drops texlive now, not dh-autoreconf (see my follow-up to #749344)
And of course, it would all have been so much easier *with* the patch...
G'luck,
Peter
--
Peter Pentchev r...@ringlet.net r...@freebsd.org p.penc...@storpool.com
PGP key:http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13
This sentence every third, but it still comprehensible.
From 175ed228efedf7688b58ced3102f5f065ad70529 Mon Sep 17 00:00:00 2001
From: Peter Pentchev r...@ringlet.net
Date: Thu, 22 May 2014 18:54:32 +0300
Subject: [PATCH] Configure the stage1 build profile in d/control.
Add the !profile.stage1 and profile.stage1 annotations to the build
dependencies as necessary.
Replace the use of -Nflex-doc in debian/rules by a Build-Profiles header
in the flex-doc control file definition.
---
debian/control | 8 +++-
debian/rules | 5 -
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index aec9c6a..fd6adbd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,9 @@ VCS-Browser: http://anonscm.debian.org/gitweb/?p=users/srivasta/debian/flex.git
Section: devel
Homepage: http://flex.sf.net/
Priority: optional
-# In the stage1 build profile, the following dependencies should be dropped:
-# - texlive-latex-base
-# - texlive-fonts-recommended
Build-Depends: bison, gettext, texinfo, help2man, file, po-debconf,
- debhelper (= 9.0.0), dh-autoreconf, texlive-latex-base,
- texlive-fonts-recommended, dpkg-dev (= 1.16.0)
+ debhelper (= 9.20140227), dh-autoreconf, texlive-latex-base !profile.stage1,
+ texlive-fonts-recommended !profile.stage1, dpkg-dev (= 1.17.2)
Maintainer: Manoj Srivastava sriva...@debian.org
Standards-Version: 3.9.5
@@ -34,6 +31,7 @@ Description: fast lexical analyzer generator
Package: flex-doc
Section: doc
Architecture: all
+Build-Profiles: !stage1
Depends: ${misc:Depends}
Description: Documentation for flex (a fast lexical analyzer generator)
Flex is a tool for generating scanners: programs which recognized lexical
diff --git a/debian/rules b/debian/rules
index 56952c8..6560647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,11 +17,6 @@ DPKG_ARCH := dpkg-architecture
export DEB_HOST_MULTIARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_MULTIARCH)
export DEB_BUILD_MULTIARCH := $(shell $(DPKG_ARCH) $(ha) -qDEB_BUILD_MULTIARCH)
-ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-DH_OPTIONS += -Nflex-doc
-export DH_OPTIONS
-endif
-
confflags = ac_cv_lib_util_getloadavg=no
ifneq ($(DEB_BUILD_MULTIARCH),$(DEB_HOST_MULTIARCH))
confflags += ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes
--
2.0.0.rc2
signature.asc
Description: Digital signature
