From 98347753062918aaec53f91bcb55a69760462448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 28 Mar 2021 10:39:04 +0700 Subject: [PATCH] yoshimi: cleanup, don't overwrite CMAKE_BUILD_TYPE --- srcpkgs/yoshimi/patches/fix-cflags.patch | 12 ++++++++++++ srcpkgs/yoshimi/template | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/yoshimi/patches/fix-cflags.patch diff --git a/srcpkgs/yoshimi/patches/fix-cflags.patch b/srcpkgs/yoshimi/patches/fix-cflags.patch new file mode 100644 index 00000000000..4baeb82ef4e --- /dev/null +++ b/srcpkgs/yoshimi/patches/fix-cflags.patch @@ -0,0 +1,12 @@ +Index: src/CMakeLists.txt +=================================================================== +--- src/CMakeLists.txt.orig ++++ src/CMakeLists.txt +@@ -262,7 +262,6 @@ if (BuildForDebug) + set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug}) + message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + else() +- set (CMAKE_BUILD_TYPE "Release") + set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease}) + message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + endif () diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template index 0096f7f0571..64a6c9ad433 100644 --- a/srcpkgs/yoshimi/template +++ b/srcpkgs/yoshimi/template @@ -4,6 +4,7 @@ version=1.7.4 revision=2 build_wrksrc=src build_style=cmake +configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share" hostmakedepends="pkg-config fltk" makedepends="boost-devel jack-devel fltk-devel fftw-devel mxml-devel cairo-devel lv2 readline-devel ncurses-devel" @@ -17,15 +18,3 @@ checksum=27a8e33bda72aafae604e14841bed6373fc9e00ff70c98f1e13215d6a8808318 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone";; esac - -configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share" - -pre_configure() { - sed -i 's|ncurses|ncursesw|g' CMakeLists.txt - - case "$XBPS_TARGET_MACHINE" in - i686*) ;; - x86_64*) ;; - *) sed -i -e "s|-msse -msse2 -mfpmath=sse||g" CMakeLists.txt;; - esac -}