Created
May 17, 2020 13:46
-
-
Save mrshpot/7e10e213b394ee547c821a0e97a2c048 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk old | |
+++ libs/openFrameworksCompiled/project/makefileCommon/config.addons.mk new | |
@@ -96,7 +96,7 @@ define parse_addon | |
$(eval ADDON_SOURCES=$(PARSED_ADDONS_SOURCE_FILES)) \ | |
$(eval PROCESS_NEXT=0) \ | |
$(if $(wildcard $(addon)/addon_config.mk), \ | |
- $(foreach var_line, $(subst $(space),?,$(shell cat $(addon)/addon_config.mk | tr '\n' '\t')), \ | |
+ $(foreach var_line, $(shell cat $(addon)/addon_config.mk | tr '\n ' '\t?'), \ | |
$(eval unscaped_var_line=$(strip $(subst ?, ,$(var_line)))) \ | |
$(if $(filter $(PROCESS_NEXT),1), $(eval $(unscaped_var_line))) \ | |
$(if $(filter %:,$(unscaped_var_line)), \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- PKGBUILD.bk 2020-05-17 16:46:22.215277658 +0300 | |
+++ PKGBUILD 2020-05-17 16:40:27.445277285 +0300 | |
@@ -15,9 +15,11 @@ | |
install=openframeworks.install | |
source=( | |
"openal_fix.patch" | |
+ "make_fix.patch" | |
"of-make-workspace" | |
"https://openframeworks.cc/versions/v${pkgver}/of_v${pkgver}_linux64gcc6_release.tar.gz") | |
sha256sums=('3e04a8ff4da53e813c0d20b87d5f2231a10767b3a0960af46b0902812b616734' | |
+ 'SKIP' | |
'b4fc38288595df566f770018d871970fb13fb2ad4af7e9e5cddc60288f338806' | |
'513cee3ce081e79fdc1a942af09869145fff3d7addeee0a76cef26fbc3ae69b1') | |
@@ -33,7 +35,16 @@ | |
# apply patch | |
cd ${_name} | |
patch -p0 < openal_fix.patch | |
+ | |
+ msg2 "Applying patch for make..." | |
+ cd - | |
+ # copy patch | |
+ cp make_fix.patch ${_name} | |
+ # apply patch | |
+ cd ${_name} | |
+ patch -p0 < make_fix.patch | |
+ | |
export OF_ROOT=${srcdir}/${_name} | |
export LC_ALL=C | |
@@ -76,7 +87,7 @@ | |
msg2 "Building OF Project Generator tool..." | |
cd apps/projectGenerator/commandLine | |
- make -j$cores Release | |
+ make Release | |
cd ${srcdir}/${_name} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment