From 6f3333d455e4386cbc2f677dacba012cc12ae8ed Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 21 Nov 2016 01:04:18 +0300 Subject: retroshare: O2 optimisation --- net-p2p/retroshare/files/O2.patch | 219 +++++++++++++++++++++++++++++++ net-p2p/retroshare/retroshare-scm.ebuild | 1 + 2 files changed, 220 insertions(+) create mode 100644 net-p2p/retroshare/files/O2.patch (limited to 'net-p2p') diff --git a/net-p2p/retroshare/files/O2.patch b/net-p2p/retroshare/files/O2.patch new file mode 100644 index 0000000..aaa1c1d --- /dev/null +++ b/net-p2p/retroshare/files/O2.patch @@ -0,0 +1,219 @@ +diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro +index 738deea..6b23e1f 100644 +--- a/libbitdht/src/libbitdht.pro ++++ b/libbitdht/src/libbitdht.pro +@@ -77,9 +77,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro +index db7066c..6ad02b8 100644 +--- a/libretroshare/src/libretroshare.pro ++++ b/libretroshare/src/libretroshare.pro +@@ -269,9 +269,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro +index 8fa292c..a80e096 100644 +--- a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro ++++ b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro +@@ -101,9 +101,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro +index d95c4bc..b83dea9 100644 +--- a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro ++++ b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro +@@ -86,9 +86,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro +index 8fa292c..a80e096 100644 +--- a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro ++++ b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro +@@ -101,9 +101,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro +index d158cdc..c861101 100644 +--- a/openpgpsdk/src/openpgpsdk.pro ++++ b/openpgpsdk/src/openpgpsdk.pro +@@ -23,9 +23,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri +index cbfec1b..f3ea2d7 100644 +--- a/plugins/Common/retroshare_plugin.pri ++++ b/plugins/Common/retroshare_plugin.pri +@@ -50,9 +50,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro +index ea2bc97..074462a 100644 +--- a/retroshare-gui/src/retroshare-gui.pro ++++ b/retroshare-gui/src/retroshare-gui.pro +@@ -55,9 +55,9 @@ MOC_DIR = temp/moc + debug { + QMAKE_CFLAGS += -g + QMAKE_CXXFLAGS -= -O2 +- QMAKE_CXXFLAGS += -O0 ++ QMAKE_CXXFLAGS += -O2 + QMAKE_CFLAGS -= -O2 +- QMAKE_CFLAGS += -O0 ++ QMAKE_CFLAGS += -O2 + } + + DEPENDPATH *= retroshare-gui +@@ -180,9 +180,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro +index 358cb65..4884370 100644 +--- a/retroshare-nogui/src/retroshare-nogui.pro ++++ b/retroshare-nogui/src/retroshare-nogui.pro +@@ -10,11 +10,11 @@ CONFIG += link_prl + #CONFIG += debug + debug { + QMAKE_CFLAGS -= -O2 +- QMAKE_CFLAGS += -O0 ++ QMAKE_CFLAGS += -O2 + QMAKE_CFLAGS += -g + + QMAKE_CXXFLAGS -= -O2 +- QMAKE_CXXFLAGS += -O0 ++ QMAKE_CXXFLAGS += -O2 + QMAKE_CXXFLAGS += -g + } + +diff --git a/supportlibs/pegmarkdown/pegmarkdown.pro b/supportlibs/pegmarkdown/pegmarkdown.pro +index cc21cca..90fc636 100644 +--- a/supportlibs/pegmarkdown/pegmarkdown.pro ++++ b/supportlibs/pegmarkdown/pegmarkdown.pro +@@ -40,7 +40,7 @@ win32 { + + # Switch off optimization for release version + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + CONFIG += dummy_glib + +diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro +index 94c942f..b802a90 100644 +--- a/tests/librssimulator/librssimulator.pro ++++ b/tests/librssimulator/librssimulator.pro +@@ -160,9 +160,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro +index d95c4bc..b83dea9 100644 +--- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro ++++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro +@@ -86,9 +86,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 +diff --git a/tests/unittests/unittests.pro b/tests/unittests/unittests.pro +index 790ab1c..72fcd58 100644 +--- a/tests/unittests/unittests.pro ++++ b/tests/unittests/unittests.pro +@@ -121,9 +121,9 @@ win32 { + + # Switch off optimization for release version + QMAKE_CXXFLAGS_RELEASE -= -O2 +- QMAKE_CXXFLAGS_RELEASE += -O0 ++ QMAKE_CXXFLAGS_RELEASE += -O2 + QMAKE_CFLAGS_RELEASE -= -O2 +- QMAKE_CFLAGS_RELEASE += -O0 ++ QMAKE_CFLAGS_RELEASE += -O2 + + # Switch on optimization for debug version + #QMAKE_CXXFLAGS_DEBUG += -O2 diff --git a/net-p2p/retroshare/retroshare-scm.ebuild b/net-p2p/retroshare/retroshare-scm.ebuild index 3c2796a..624e273 100644 --- a/net-p2p/retroshare/retroshare-scm.ebuild +++ b/net-p2p/retroshare/retroshare-scm.ebuild @@ -102,6 +102,7 @@ src_prepare() { retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed' epatch "${FILESDIR}/hidden_service.patch" + epatch "${FILESDIR}/O2.patch" epatch_user } -- cgit v1.2.3