Merge lp:~thomas-voss/net-cpp/fix-1452333 into lp:net-cpp

Proposed by Thomas Voß
Status: Needs review
Proposed branch: lp:~thomas-voss/net-cpp/fix-1452333
Merge into: lp:net-cpp
Diff against target: 32 lines (+0/-12)
2 files modified
debian/control (+0/-4)
debian/rules (+0/-8)
To merge this branch: bzr merge lp:~thomas-voss/net-cpp/fix-1452333
Reviewer Review Type Date Requested Status
Andreas Pokorny (community) Approve
Ubuntu Phablet Team Pending
Review via email: mp+264888@code.launchpad.net

Commit message

Remove explicit dependency on gcc version.

Description of the change

Remove explicit dependency on gcc version.

To post a comment you must log in.
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

package builds fine, and yes stating the CMAKE_CXX_COMPILER like that is not needed.

review: Approve

Unmerged revisions

50. By Thomas Voß

Remove explicit dependency on gcc version.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2015-02-25 10:27:29 +0000
+++ debian/control 2015-07-15 17:52:29 +0000
@@ -6,10 +6,6 @@
6 doxygen,6 doxygen,
7 google-mock,7 google-mock,
8 graphviz,8 graphviz,
9# We rely on C++11 features, and to prevent from ABI breaks
10# in libstdc++ causing us issues, we explicitly select a G++
11# version.
12 g++-4.9,
13 libboost-dev,9 libboost-dev,
14 libboost-serialization-dev,10 libboost-serialization-dev,
15 libboost-system-dev,11 libboost-system-dev,
1612
=== modified file 'debian/rules'
--- debian/rules 2014-06-27 08:16:12 +0000
+++ debian/rules 2015-07-15 17:52:29 +0000
@@ -5,13 +5,5 @@
55
6include /usr/share/dpkg/default.mk6include /usr/share/dpkg/default.mk
77
8# Explicitly selecting a G{CC,++}-version here to avoid accidental
9# ABI breaks introduced by toolchain updates.
10export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
11export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
12
13%:8%:
14 dh $@ --fail-missing9 dh $@ --fail-missing
15
16override_dh_auto_configure:
17 dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)

Subscribers

People subscribed via source and target branches