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

Add support for kFreeBSD to GRASS plugin. #3068

Merged
merged 1 commit into from
May 13, 2016

Conversation

sebastic
Copy link
Contributor

As reported in Debian Bug #824079, builds of qgis on kFreeBSD failed:

  /«BUILDDIR»/qgis-2.14.2+dfsg/src/plugins/grass/qtermwidget/kpty.cpp: In member function 'bool KPty::tcGetAttr(termios*) const':
  /«BUILDDIR»/qgis-2.14.2+dfsg/src/plugins/grass/qtermwidget/kpty.cpp:126:44: error: 'TCGETS' was not declared in this scope
   #  define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
                                              ^
  /«BUILDDIR»/qgis-2.14.2+dfsg/src/plugins/grass/qtermwidget/kpty.cpp:647:12: note: in expansion of macro '_tcgetattr'
       return _tcgetattr(d->masterFd, ttmode) == 0;
              ^
  /«BUILDDIR»/qgis-2.14.2+dfsg/src/plugins/grass/qtermwidget/kpty.cpp: In member function 'bool KPty::tcSetAttr(termios*)':
  /«BUILDDIR»/qgis-2.14.2+dfsg/src/plugins/grass/qtermwidget/kpty.cpp:136:44: error: 'TCSETS' was not declared in this scope
   #  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
                                              ^
  /«BUILDDIR»/qgis-2.14.2+dfsg/src/plugins/grass/qtermwidget/kpty.cpp:654:12: note: in expansion of macro '_tcsetattr'
       return _tcsetattr(d->masterFd, ttmode) == 0;
              ^

This is caused by the lack of the GNU/kFreeBSD define in the list of BSD variants to test.

Adding __FreeBSD_kernel__ as documented in the kFreeBSD FAQ in src/plugins/grass/qtermwidget/kpty.cpp resolves the issue.

@sebastic
Copy link
Contributor Author

The Travis failures are unexpected, and don't seem to be caused by the changes in this PR.

@m-kuhn m-kuhn merged commit b1f59f3 into qgis:master May 13, 2016
@sebastic sebastic deleted the qtermwidget-kfreebsd branch May 13, 2016 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants