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

[Thomas Voß]

Remove explicit dependency on gcc version.

Remove explicit dependency on gcc version.

[Andreas Pokorny (andreas-pokorny)]

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

review: Approve

Unmerged revisions

50. By Thomas Voß on 2015-07-15

Remove explicit dependency on gcc version.

=== 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 @@
                doxygen,
                google-mock,
                graphviz,
-# We rely on C++11 features, and to prevent from ABI breaks
-# in libstdc++ causing us issues, we explicitly select a G++
-# version.
-               g++-4.9,
                libboost-dev,
                libboost-serialization-dev,
                libboost-system-dev,

=== 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 @@
 
 include /usr/share/dpkg/default.mk
 
-# Explicitly selecting a G{CC,++}-version here to avoid accidental
-# ABI breaks introduced by toolchain updates.
-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
-
 %:
 	dh $@ --fail-missing
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)