Mir

Merge lp://staging/~albaguirre/mir/possibly-fix-yakkety-build-failure into lp://staging/mir

possibly-fix-yakkety-build-failure
Merge into development-branch

Proposed by Alberto Aguirre on 2016-07-07

Status:

Merged

Merged at revision:

3585

Proposed branch:

lp://staging/~albaguirre/mir/possibly-fix-yakkety-build-failure

Merge into:

lp://staging/mir

Diff against target:

11 lines (+1/-0)

1 file modified

examples/cursors_demo_client.c (+1/-0)

To merge this branch:

bzr merge lp://staging/~albaguirre/mir/possibly-fix-yakkety-build-failure

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Approve on 2016-07-13
Mir CI Bot	continuous-integration		Needs Fixing on 2016-07-12
Chris Halse Rogers			Approve on 2016-07-12
Kevin DuBois (community)			Approve on 2016-07-11
Cemil Azizoglu (community)		2016-07-07	Approve on 2016-07-07
Review via email: mp+299445@code.staging.launchpad.net

Commit message

Fix build failure under yakkety

Fixes: LP: #1600343

Description of the change

Could not reproduce under a yakkety chroot - but seeing a failure in ppa builders:

[ 60%] Building C object examples/CMakeFiles/mir_demo_client_cursors.dir/cursors_demo_client.c.o
cd /«BUILDDIR»/mir-0.23.3+16.10.20160707/obj-arm-linux-gnueabihf/examples && /usr/bin/arm-linux-gnueabihf-gcc -DLOG_NDEBUG=1 -DMESA_EGL_NO_X11_HEADERS -DMIR_LIBINPUT_HAS_ACCEL_PROFILE=1 -DMIR_VERSION_MAJOR=0 -DMIR_VERSION_MICRO=2 -DMIR_VERSION_MINOR=23 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I/«BUILDDIR»/mir-0.23.3+16.10.20160707/include/common -I/«BUILDDIR»/mir-0.23.3+16.10.20160707/include/cookie -I/«BUILDDIR»/mir-0.23.3+16.10.20160707/obj-arm-linux-gnueabihf/src/protobuf -I/«BUILDDIR»/mir-0.23.3+16.10.20160707/include/server -I/«BUILDDIR»/mir-0.23.3+16.10.20160707/include/client -I/«BUILDDIR»/mir-0.23.3+16.10.20160707/include/platform -I/«BUILDDIR»/mir-0.23.3+16.10.20160707/include/renderers/gl -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pthread -g -Werror -Wall -pedantic -Wextra -fPIC -flto -std=c99 -Wall -fno-strict-aliasing -Wextra -o CMakeFiles/mir_demo_client_cursors.dir/cursors_demo_client.c.o -c /«BUILDDIR»/mir-0.23.3+16.10.20160707/examples/cursors_demo_client.c
/usr/bin/arm-linux-gnueabihf-g++ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pthread -g -std=c++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC -flto -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,--no-undefined CMakeFiles/mir_demo_client_egltriangle.dir/egltriangle.c.o -o ../bin/mir_demo_client_egltriangle.bin -rdynamic libeglapp.a ../lib/libmirclient.so.9 ../lib/libmircommon.so.6 -lboost_date_time -lboost_system -lboost_program_options -lboost_filesystem -ldl -lxkbcommon ../lib/libmirprotobuf.so.3 -lprotobuf-lite ../lib/libmircookie.so.2 -lnettle -lEGL -lGLESv2
In file included from /usr/include/stdint.h:25:0,
                 from /usr/lib/gcc/arm-linux-gnueabihf/5/include/stdint.h:9,
                 from /«BUILDDIR»/mir-0.23.3+16.10.20160707/include/client/mir_toolkit/events/event.h:23,
                 from /«BUILDDIR»/mir-0.23.3+16.10.20160707/include/client/mir_toolkit/client_types.h:24,
                 from /«BUILDDIR»/mir-0.23.3+16.10.20160707/include/client/mir_toolkit/mir_connection.h:21,
                 from /«BUILDDIR»/mir-0.23.3+16.10.20160707/include/client/mir_toolkit/mir_client_library.h:21,
                 from /«BUILDDIR»/mir-0.23.3+16.10.20160707/examples/cursors_demo_client.c:21:
/usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp]
# warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-07-07:

1. We should remove #define _BSD_SOURCE" as silo might still fail when it encounters this. Or does that cause something else to fail?

2. you need to remove the other instance in progressbar.c.

3. Yet another instance is in src/CMakeLists.txt (which also has "_DEFAULT_SOURCE" defined).

review: Needs Fixing

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-07-07:

This is lp:1435127, BTW... and the #3 mentioned above was added then.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-07:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1245/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-07-07:

PPA builds with both definitions. So approved...

review: Approve

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-07-08:

so this is needed for 0.23.3 and 0.24.0?

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2016-07-08:

> so this is needed for 0.23.3 and 0.24.0?

Yeah

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2016-07-08:

"17:17:36 11: [ FAILED ] ApplicationNotRespondingDetection.failure_to_pong_is_noticed
17:17:36 11: [ FAILED ] ServerDisconnect.is_detected_by_client
17:17:36 11: [ FAILED ] ServerDisconnect.doesnt_stop_client_calling_API_functions
17:17:36 11: [ FAILED ] ServerStartup.creates_endpoint_on_filesystem
17:17:36 11: [ FAILED ] ServerStartup.after_server_sigkilled_can_start_new_instance
17:17:36 11: [ FAILED ] UnresponsiveClient.does_not_hang_server
"

Looks unrelated to this MP

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-08:

review: Needs Fixing (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-07-08:

filed bug (has to be targetted to 3 series) LP: #1600343. updated commit/description in this MP.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-07-11:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1260/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-07-11:

was pulled into 0.24... also lgtm

review: Approve

Revision history for this message

Chris Halse Rogers (raof) wrote on 2016-07-12:

LGTM.

from “man feature_test_macros”
_BSD_SOURCE:
…
          Since glibc 2.20, this macro is deprecated. It now has the same effect as defining _DEFAULT_SOURCE, but generates a compile-time warning (unless _DEFAULT_SOURCE is also defined). Use
          _DEFAULT_SOURCE instead. To allow code that requires _BSD_SOURCE in glibc 2.19 and earlier and _DEFAULT_SOURCE in glibc 2.20 and later to compile without warnings, define both _BSD_SOURCE and
          _DEFAULT_SOURCE.