Bug 249504 - devel/gn: Fix build on 11.4 and 11-STABLE
Summary: devel/gn: Fix build on 11.4 and 11-STABLE
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords: buildisok, patch
Depends on:
Blocks:
 
Reported: 2020-09-21 10:45 UTC by Oleh Hushchenkov
Modified: 2020-09-21 16:47 UTC (History)
1 user (show)

See Also:


Attachments
Patch v1 (1.66 KB, patch)
2020-09-21 10:45 UTC, Oleh Hushchenkov
o.hushchenkov: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Oleh Hushchenkov 2020-09-21 10:45:15 UTC
Created attachment 218140 [details]
Patch v1

Undefine major()/minor() from sys/types.h.

Reported and submitted by @kib via email.

This fixes name conflict:

In file included from ../src/gn/function_process_file_template_unittest.cc:6:
In file included from ../src/gn/test_with_scope.h:12:
In file included from ../src/gn/build_settings.h:21:
./src/gn/version.h:18:7: error: expected ')'
/usr/include/sys/types.h:372:42: note: expanded from macro 'major'
#define major(x)        ((int)(((u_int)(x) >> 8)&0xff)) /* major number */
                                                ^
./src/gn/version.h:18:7: note: to match this '('
/usr/include/sys/types.h:372:24: note: expanded from macro 'major'
#define major(x)        ((int)(((u_int)(x) >> 8)&0xff)) /* major number */
                              ^
Comment 1 Automation User 2020-09-21 11:14:55 UTC
Build info is available at https://gitlab.com/swills/freebsd-ports/pipelines/192432045
Comment 2 commit-hook freebsd_committer 2020-09-21 16:47:21 UTC
A commit references this bug:

Author: swills
Date: Mon Sep 21 16:46:19 UTC 2020
New revision: 549458
URL: https://svnweb.freebsd.org/changeset/ports/549458

Log:
  devel/gn: Fix build on 11.4 and 11-STABLE

  PR:		249504
  Submitted by:	Oleh Hushchenkov <o.hushchenkov@gmail.com> (maintainer)

Changes:
  head/devel/gn/Makefile
  head/devel/gn/files/patch-build_gen.py
  head/devel/gn/files/patch-src_gn_version.h
Comment 3 Steve Wills freebsd_committer 2020-09-21 16:47:46 UTC
Committed, thanks!