Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

depends: fix fontconfig with newer glibc #10851

Merged
merged 1 commit into from Aug 3, 2017

Conversation

Projects
None yet
7 participants
@theuni
Copy link
Member

theuni commented Jul 17, 2017

Fixes build with newer gcc.

Without this, depends builds fail with gcc7, maybe gcc6.

@laanwj laanwj added this to the 0.15.0 milestone Jul 17, 2017

@gmaxwell

This comment has been minimized.

Copy link
Member

gmaxwell commented Jul 17, 2017

Sounds fine to me.

@achow101

This comment has been minimized.

Copy link
Member

achow101 commented Jul 17, 2017

This fails to build for me with this warning:

/home/andy/bitcoin4/depends/work/build/x86_64-pc-linux-gnu/fontconfig/2.12.4-5ee293e84f5/missing: line 81: gperf: command not found
WARNING: 'gperf' is missing on your system.
         You might have modified some files without having the proper
         tools for further handling them.  Check the 'README' file, it
         often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in
         case some other package contains this missing 'gperf' program.

It looks like travis failed with the same error

Installing gperf results in this error:

make[4]: Entering directory '/home/andy/bitcoin4/depends/work/build/x86_64-pc-linux-gnu/fontconfig/2.12.4-5ee293e84f5/src'
  CC       fcatomic.lo
  CC       fcblanks.lo
  CC       fccache.lo
  CC       fccfg.lo
  CC       fccharset.lo
  CC       fccompat.lo
  CC       fcdefault.lo
  CC       fcdbg.lo
  CC       fcdir.lo
  CC       fcformat.lo
  CC       fcfreetype.lo
  CC       fcinit.lo
  CC       fcfs.lo
  CC       fclang.lo
  CC       fclist.lo
  CC       fcmatch.lo
  CC       fcmatrix.lo
  CC       fcname.lo
  CC       fcobjs.lo
  CC       fcpat.lo
  CC       fcrange.lo
In file included from fcobjs.c:33:0:
fcobjshash.gperf:28:1: error: conflicting types for ‘FcObjectTypeHash’
 "aspect",FC_ASPECT_OBJECT
 ^~~~~~~~~~~~~~~~
fcobjs.c:28:1: note: previous declaration of ‘FcObjectTypeHash’ was here
 FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
 ^~~~~~~~~~~~~~~~
In file included from fcobjs.c:33:0:
fcobjshash.gperf:172:1: error: conflicting types for ‘FcObjectTypeLookup’
fcobjs.c:31:1: note: previous declaration of ‘FcObjectTypeLookup’ was here
 FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
 ^~~~~~~~~~~~~~~~~~
Makefile:642: recipe for target 'fcobjs.lo' failed
make[4]: *** [fcobjs.lo] Error 1
@theuni

This comment has been minimized.

Copy link
Member Author

theuni commented Jul 17, 2017

grr! Upstream borked this. I'll just cherry-pick the patch into our current version instead.

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Jul 18, 2017

Hehe, that's what you get when you say "fixes build", you get reports of new build problems.

More seriously: this is only used for linking against, right? does raising the fontconfig version raise the minimum fontconfig version requires on the user's system? (by changing the ABI)

@theuni

This comment has been minimized.

Copy link
Member Author

theuni commented Jul 19, 2017

@laanwj Yes, this is only for linking against.

That's a good question. We should make sure to check before bumping.

@jonasschnelli

This comment has been minimized.

Copy link
Member

jonasschnelli commented Jul 19, 2017

Gitian build errors:

Linux:

/home/ubuntu/build/bitcoin/depends/work/build/i686-pc-linux-gnu/fontconfig/2.12.4-e57b06ea870/missing: line 81: gperf: command not found
WARNING: 'gperf' is missing on your system.
@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Aug 1, 2017

This seems more trouble than it's worth for 0.15.

Could we maybe backport just the build fix for gcc6/7?

@MarcoFalke MarcoFalke modified the milestones: 0.14.3, 0.15.0 Aug 1, 2017

@MarcoFalke MarcoFalke modified the milestones: 0.15.0, 0.14.3 Aug 1, 2017

@MarcoFalke

This comment has been minimized.

Copy link
Member

MarcoFalke commented Aug 1, 2017

This should also be backported to 0.14.3.

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Aug 1, 2017

Not in the current state at least...

@theuni

This comment has been minimized.

Copy link
Member Author

theuni commented Aug 1, 2017

@laanwj Yes, will do that today.

depends: fix fontconfig with newer glibc
See comment for more detail

@theuni theuni force-pushed the theuni:fontconfig-bump branch to 3498a8d Aug 3, 2017

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Aug 3, 2017

Travis is a timeout, and probably unrelated, respinning

@MarcoFalke

This comment has been minimized.

Copy link
Member

MarcoFalke commented Aug 3, 2017

Can confirm that 3498a8d compiles on gcc7.1.1

@laanwj laanwj changed the title depends: bump fontconfig to 2.12.4 depends: fix fontconfig with newer glibc Aug 3, 2017

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Aug 3, 2017

Changed the PR title to reflect what the commit does :)

@laanwj laanwj merged commit 3498a8d into bitcoin:master Aug 3, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Aug 3, 2017

Merge #10851: depends: fix fontconfig with newer glibc
3498a8d depends: fix fontconfig with newer glibc (Cory Fields)

Pull request description:

  Fixes build with newer gcc.

  Without this, depends builds fail with gcc7, maybe gcc6.

Tree-SHA512: 3cfcebdb137c3e368c69d25012ceb32809890e67521aaa8b074f2092f847e3e7ae82ac9050b4600ba18f443d2a8fe1f8523c808d77642a1e7782d558cbad4a74

@laanwj laanwj removed the Needs backport label Aug 21, 2017

codablock added a commit to codablock/dash that referenced this pull request Jan 30, 2018

Merge bitcoin#10851: depends: fix fontconfig with newer glibc
3498a8d depends: fix fontconfig with newer glibc (Cory Fields)

Pull request description:

  Fixes build with newer gcc.

  Without this, depends builds fail with gcc7, maybe gcc6.

Tree-SHA512: 3cfcebdb137c3e368c69d25012ceb32809890e67521aaa8b074f2092f847e3e7ae82ac9050b4600ba18f443d2a8fe1f8523c808d77642a1e7782d558cbad4a74

@sickpig sickpig referenced this pull request Jun 5, 2018

Merged

[PORT] Depends cherries #1120

CryptoCentric added a commit to absolute-community/absolute that referenced this pull request Feb 28, 2019

Merge bitcoin#10851: depends: fix fontconfig with newer glibc
3498a8d depends: fix fontconfig with newer glibc (Cory Fields)

Pull request description:

  Fixes build with newer gcc.

  Without this, depends builds fail with gcc7, maybe gcc6.

Tree-SHA512: 3cfcebdb137c3e368c69d25012ceb32809890e67521aaa8b074f2092f847e3e7ae82ac9050b4600ba18f443d2a8fe1f8523c808d77642a1e7782d558cbad4a74

CryptoCentric added a commit to absolute-community/absolute that referenced this pull request Mar 2, 2019

Merge bitcoin#10851: depends: fix fontconfig with newer glibc
3498a8d depends: fix fontconfig with newer glibc (Cory Fields)

Pull request description:

  Fixes build with newer gcc.

  Without this, depends builds fail with gcc7, maybe gcc6.

Tree-SHA512: 3cfcebdb137c3e368c69d25012ceb32809890e67521aaa8b074f2092f847e3e7ae82ac9050b4600ba18f443d2a8fe1f8523c808d77642a1e7782d558cbad4a74
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.