summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-18 01:39:00 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-18 01:39:00 +0000
commite9592f3a2c7d8fccc0075e6400e90bae5014b69e (patch)
treeb880a3551f434223a081668e0b7273372d8e907b
parent1981ed80d958ac240a400133872e3bb18a4e1456 (diff)
fix flac build when arch != mipsel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2169 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/flac/Makefile1
-rw-r--r--openwrt/package/flac/patches/no_encoder.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/openwrt/package/flac/Makefile b/openwrt/package/flac/Makefile
index 9baa0da852..281b2c47ee 100644
--- a/openwrt/package/flac/Makefile
+++ b/openwrt/package/flac/Makefile
@@ -26,6 +26,7 @@ $(PKG_BUILD_DIR)/.built:
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lite \
$(TARGET_CONFIGURE_OPTS) \
+ RELEASE_CFLAGS="$(TARGET_CFLAGS)" \
libFLAC
touch $@
diff --git a/openwrt/package/flac/patches/no_encoder.patch b/openwrt/package/flac/patches/no_encoder.patch
index 64666e8034..f1d6fe277a 100644
--- a/openwrt/package/flac/patches/no_encoder.patch
+++ b/openwrt/package/flac/patches/no_encoder.patch
@@ -6,7 +6,7 @@ diff -ru flac-1.1.2.OLD/build/lib.mk flac-1.1.2.NEW/build/lib.mk
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
-release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
-+release : CFLAGS = -Os -pipe -mips32 -mtune=mips32 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
++release : CFLAGS = -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
LFLAGS = -L$(LIBPATH)