Commit 7f2a563f authored by Adam Borowski's avatar Adam Borowski

plugwash's (raspbian) patch to fix FTBFS with new cmake

parent 70be8498
ifrit (4.1.2-5+rpi1) buster-staging; urgency=medium
* Set DESIRED_QT_VERSION to 4 through a new override_dh_auto_configure target
+ Note: the package has a target called override_dh_autoconfigure which does
nothing due to a typo in it's name, I tried fixing said typo but that
seemed to cause more problems than it solved.
-- Peter Michael Green <plugwash@raspbian.org> Fri, 04 May 2018 12:45:53 +0000
ifrit (4.1.2-5) unstable; urgency=medium ifrit (4.1.2-5) unstable; urgency=medium
* QA upload. * QA upload.
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0 CFLAGS += -O0
else else
...@@ -19,6 +21,8 @@ endif ...@@ -19,6 +21,8 @@ endif
%: %:
dh $@ --buildsystem=cmake --sourcedirectory=build dh $@ --buildsystem=cmake --sourcedirectory=build
#this target doesn't actually do anything, because of a typo in it's name,
#i tried fixing said typo but that caused more problems than it solved --plugwash
override_dh_autoconfigure: override_dh_autoconfigure:
cd build && cmake \ cd build && cmake \
-DDESIRED_QT_VERSION:STRING=4 \ -DDESIRED_QT_VERSION:STRING=4 \
...@@ -27,6 +31,9 @@ override_dh_autoconfigure: ...@@ -27,6 +31,9 @@ override_dh_autoconfigure:
-DCMAKE_EXE_LINKER_FLAGS:STRING="${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -lGL" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -lGL" \
-DCMAKE_COLOR_MAKEFILE:BOOL=FALSE -DCMAKE_COLOR_MAKEFILE:BOOL=FALSE
override_dh_auto_configure:
dh_auto_configure -- -DDESIRED_QT_VERSION=4
override_dh_clean: override_dh_clean:
# Clean up stuff which make clean leaves behind # Clean up stuff which make clean leaves behind
rm -f build/CMakeCache.txt build/cmake_install.cmake build/Makefile rm -f build/CMakeCache.txt build/cmake_install.cmake build/Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment