sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the ALSA=OFF build after r402530.

Browse source 
Both extrapatch-no_alsa and patch-git_d6927712 touch the same region of
CMakeLists.txt, and the latter was failing to apply when the ALSA option was
disabled.

Fix it by keeping patch-git_d6927712 (which fixes the CFLAGS values
regardless of the value of the ALSA option) and replacing extrapatch-no_alsa
with some post-patch/post-configure changes that achieve the same end
result.

PR:		204858
MFH:		2015Q4
This commit is contained in:
Raphael Kubo da Costa 2015-11-28 16:51:41 +00:00
parent 1e5dea6357
commit ec847eab07
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=402545
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
audio/libkcompactdisc/Makefile
View file

@ -19,6 +19,12 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= ALSA
ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
ALSA_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no_alsa
post-patch-ALSA-off:
${REINPLACE_CMD} -e '/find_package(Alsa)/d' \
-e '/alsa_configure_file/d' ${WRKSRC}/CMakeLists.txt
post-configure-ALSA-off:
${TOUCH} ${CONFIGURE_WRKSRC}/config-alsa.h
.include <bsd.port.mk>

16
audio/libkcompactdisc/files/extrapatch-no_alsa
View file

@ -1,16 +0,0 @@
--- CMakeLists.txt.orig 2013-07-09 23:19:54.000000000 +0000
+++ CMakeLists.txt 2013-08-12 23:11:31.141329406 +0000
@@ -8,10 +8,10 @@
## Compiler flags
if(CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_C_FLAGS "-std=c99") ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
endif()
-find_package(Alsa)
-alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
+find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH})
+configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h)
include_directories(${KDE4_INCLUDES})
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})