From afe09b186255663ae9494bf04b5788e22a2fb14b Mon Sep 17 00:00:00 2001 From: Elaine Gibson Date: Fri, 16 Feb 2024 10:21:04 +0000 Subject: [PATCH] attract: respect cflags --- srcpkgs/attract/patches/Makefile.patch | 25 +++++++++++++++++-------- srcpkgs/attract/template | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/srcpkgs/attract/patches/Makefile.patch b/srcpkgs/attract/patches/Makefile.patch index 6310a9fd365269..434c08dea38958 100644 --- a/srcpkgs/attract/patches/Makefile.patch +++ b/srcpkgs/attract/patches/Makefile.patch @@ -1,16 +1,16 @@ -diff --git a/Makefile.orig b/Makefile -index 4f4793a9a69..b1f7cf469f4 100644 ---- a/Makefile.orig +diff --git a/Makefile b/Makefile +index 4f4793a..82387e0 100644 +--- a/Makefile +++ b/Makefile -@@ -69,15 +69,10 @@ +@@ -69,15 +69,7 @@ FE_VERSION=v2.7.0 -CC=gcc -CXX=g++ - CFLAGS= - CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS) - CPPFLAGS= +-CFLAGS= +-CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS) +-CPPFLAGS= -STRIP=strip -OBJCOPY=objcopy PKG_CONFIG=pkg-config @@ -18,7 +18,16 @@ index 4f4793a9a69..b1f7cf469f4 100644 ARFLAGS=rc RM=rm -f MD=mkdir -p -@@ -512,7 +507,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR) +@@ -308,7 +300,7 @@ ifeq ($(FE_DEBUG),1) + FE_FLAGS += -DFE_DEBUG + ENABLE_DEBUG_SYMBOLS=1 + else +- CPPFLAGS += -O$(OPTIMIZE) -DNDEBUG ++ CPPFLAGS += -DNDEBUG + endif + + ifeq ($(USE_GLES),1) +@@ -512,7 +504,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR) $(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO) $(EXE_MSG) diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template index e769fb15456217..776cbe4ebd2c93 100644 --- a/srcpkgs/attract/template +++ b/srcpkgs/attract/template @@ -1,7 +1,7 @@ # Template file for 'attract' pkgname=attract version=2.7.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="VERBOSE=1" make_use_env=yes