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

Re: Bug#822110: odil: FTBFS when built with dpkg-buildpackage -A (chrpath fails)



On Fri, Apr 22, 2016 at 12:27:17PM +0200, Julien Lamy wrote:
> > I'm going to test them out, and check if that works as expected, if not,
> > well, I'll try to have it working :)  (hope you're ok with it)
> 
> Hope it works for you! Any modification is welcome, and if you can't get
> it working, just tell me and I'll try to fix it on my side.

Ok, it works, I just did a minor edit to remove useless definitions of
CFLAGS, etc (they are uselss as 1/ they are not exported, so basically
nothing sees them 2/ debhelper in compat level 9 already exports them)


> > From a quick glance on git, to me it seems that you forgot about the
> > override_dh_configure override (as you don't want it for -indep, but you
> > do for -arch).
> 
> This is by choice: since dh_configure is very fast for this package, I
> favored a smaller d/rules. If it's a bad choice, just tell me :-)

tbh, I find this nicer:

diff --git a/debian/rules b/debian/rules
index 8ace958..ae09f32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,9 +12,6 @@ override_dh_auto_build-indep:
 override_dh_auto_test-arch:
        cd build && ../tests/run --no-network
 
-# No test for arch-independent packages
-override_dh_auto_test-indep: ;
-
 override_dh_install-arch:
        dh_install
        chrpath -d debian/python-odil/usr/lib/python*/dist-packages/odil.so
@@ -30,5 +27,8 @@ override_dh_install-arch:
                 --override s/libboost_system.*-dev/libboost-system-dev/ \
                debian/tmp/usr/lib/*.so
 
-# No install step for arch-independent packages
-override_dh_auto_install-indep: ;
+
+# These steps are not needed for arch-independent packages
+override_dh_auto_configure-indep:
+override_dh_auto_test-indep:
+override_dh_auto_install-indep:

and it uses the sae number of lines, but it's fine also as you did it
(there is no need for semi-colons, also the target overrides could be on
a single line, but I like this way more).

I pushed my small change, please tell me if you are happy with the
current state of git (I won't commit this diff above, if you want it do
it yourself :)) and I can upload as-is.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

Attachment: signature.asc
Description: PGP signature


Reply to: