IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(webapp/Makefile): Drop quotes around appended cppflags (#27374)

Browse Source 
Currently, if you're building under aarch64 and have cppflags set in your environment as such:

`CPPFLAGS="-O2 -Wall -fomit-frame-pointer -march=armv8-a -mtune=neoverse-n1 -Wp,-D_FORTIFY_SOURCE=3"`

This will result in `-DPNG_ARM_NEON_OPT=0` being improperly applied:

`CPPFLAGS="-O2 -Wall -fomit-frame-pointer -march=armv8-a -mtune=neoverse-n1 -Wp,-D_FORTIFY_SOURCE=3 " -DPNG_ARM_NEON_OPT=0""`

As a result, when npm install is ran, it will fail. To fix this, we remove the quotes around the appended cppflags

Signed-off-by: RJ Sampson <rj.sampson@chainguard.dev>
This commit is contained in:
RJ Trujillo 2024-06-18 15:56:45 -04:00 committed by GitHub
parent 1bbc3b4e83
commit fe5ddaee8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/Makefile
View File

@ -8,12 +8,12 @@ CI ?= false
# please see optipng-bin Linux arm64 support issue (https://github.com/imagemin/optipng-bin/issues/118) for details: # please see optipng-bin Linux arm64 support issue (https://github.com/imagemin/optipng-bin/issues/118) for details:
ifeq ($(shell uname)/$(shell uname -m),Linux/aarch64) ifeq ($(shell uname)/$(shell uname -m),Linux/aarch64)
LINUX_ARM64 = true LINUX_ARM64 = true
CPPFLAGS += " -DPNG_ARM_NEON_OPT=0" CPPFLAGS += -DPNG_ARM_NEON_OPT=0
endif endif
# Exact same issue but for Linux/PPC64 # Exact same issue but for Linux/PPC64
ifeq ($(findstring Linux/ppc64,$(shell uname)/$(shell uname -m)),Linux/ppc64) ifeq ($(findstring Linux/ppc64,$(shell uname)/$(shell uname -m)),Linux/ppc64)
LINUX_PPC64 = true LINUX_PPC64 = true
CPPFLAGS += " -DPNG_POWERPC_VSX_OPT=0" CPPFLAGS += -DPNG_POWERPC_VSX_OPT=0
endif endif
.PHONY: run .PHONY: run