Ubuntu
perl package

Merge lp:~paul-codesourcery/ubuntu/maverick/perl/config_patchlevel_h_fix into lp:ubuntu/maverick/perl

  1. Maverick (10.10)
  2. config_patchlevel_h_fix
  3. Merge into maverick
Proposed by Paul Brook
Status: Merged
Merged at revision: 35
Proposed branch: lp:~paul-codesourcery/ubuntu/maverick/perl/config_patchlevel_h_fix
Merge into: lp:ubuntu/maverick/perl
Diff against target: 13 lines (+2/-1)
1 file modified
debian/config.debian (+2/-1)
To merge this branch: bzr merge lp:~paul-codesourcery/ubuntu/maverick/perl/config_patchlevel_h_fix
Reviewer Review Type Date Requested Status
James Westby (community) Abstain
Loïc Minier Approve
Review via email: mp+29683@code.launchpad.net

Description of the change

By default patchlevel.h includes git_version.h. The latter is generated by configure.
However the debian/config.debian uses patchlevel.h before running configure.
This has always been fairly borken, but old GCC processed the rest of the file anyway, and none noticed the compiler errors. Recent GCC (4.5, linaro) consider this a fatal error and produce no output.

Defining PERL_PATCHLEVEL_H_IMPLICIT avoids requiring git_version.h while still providing the necessary symbols.

To post a comment you must log in.
Revision history for this message
Loïc Minier (lool) wrote :

Looks fine; thanks

review: Approve
Revision history for this message
James Westby (james-w) :
review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/config.debian'
2--- debian/config.debian 2010-05-04 16:32:38 +0000
3+++ debian/config.debian 2010-07-12 10:21:41 +0000
4@@ -2,7 +2,8 @@
5
6 eval $(echo '#include "./patchlevel.h"
7 SETver=PERL_REVISION.PERL_VERSION;
8-SETsubver= PERL_SUBVERSION' | gcc -E - | sed -n '/^SET/{s///;s/ //gp;}')
9+SETsubver= PERL_SUBVERSION' | gcc -E -DPERL_PATCHLEVEL_H_IMPLICIT - \
10+| sed -n '/^SET/{s///;s/ //gp;}')
11
12 fullver="$ver.$subver"
13 nextver="$ver."$(($subver+1))

Subscribers

People subscribed via source and target branches

to all changes: