Thursday, October 31, 2019

[ports-gcc] Unbreak devel/kdevelop

Hi!

> http://build-failures.rhaalovely.net/sparc64/2019-10-11/devel/kdevelop.log
> http://build-failures.rhaalovely.net/powerpc/2019-10-11/devel/kdevelop.log
(Logs from the previous version, but the issue remains)

The real issue is here:

--8<--
CMake Warning at plugins/welcomepage/CMakeLists.txt:33 (message):
Applying workaround for
https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
-->8--

Upstream brought a fix for gcc-5 [0], that breaks the build on base-gcc
archs, where ports-gcc-8.3 is used to build the port.

Removing the fix allows to build KDevelop on macppc [1] -- with
Rafael's Qt-5.9.8 diff -- and on amd64 with the vanilla Qt-5.9.7. The
runtime is (very slow but) fine as well.

REVISION bump seems superfluous: this version never built on base-gcc
archs and brings no change on base-clang ones. Should i remove it?

Comments/feedback are welcome,

Charlène.


[0] https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
[1] https://bin.charlenew.xyz/kdevelop.log.gz


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/kdevelop/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile 25 Oct 2019 20:13:53 -0000 1.31
+++ Makefile 31 Oct 2019 15:00:13 -0000
@@ -6,6 +6,7 @@ USE_WXNEEDED = Yes
COMMENT = IDE for C, C++, Python, QML/JavaScript and PHP

VERSION = 5.4.3
+REVISION = 0
DISTNAME = kdevelop-${VERSION}

HOMEPAGE = https://www.kdevelop.org/
Index: patches/patch-plugins_welcomepage_CMakeLists_txt
===================================================================
RCS file: patches/patch-plugins_welcomepage_CMakeLists_txt
diff -N patches/patch-plugins_welcomepage_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_welcomepage_CMakeLists_txt 31 Oct 2019 15:00:13 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Drop useless fix used for gcc-5, because it breaks the build with
+ports-gcc>=8.3.0.
+
+Index: plugins/welcomepage/CMakeLists.txt
+--- plugins/welcomepage/CMakeLists.txt.orig
++++ plugins/welcomepage/CMakeLists.txt
+@@ -28,8 +28,3 @@ target_link_libraries(kdevwelcomepage
+ Qt5::QuickWidgets
+ KF5::Declarative
+ )
+-# see https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899
+-if
(UNIX AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+- message(WARNING "Applying workaround for https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899")
+- target_link_libraries(kdevwelcomepage gcc_s gcc)
+-endif()

No comments:

Post a Comment