diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/mplayer | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 6d6438fa9..0bef82316 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -29,9 +29,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -# gcc 4.5 produces internal compiler error with -Os -#TCFLAGS:=$(subst Os,O2,$(TCFLAGS)) - CONFIG_STYLE:= minimal FAKE_FLAGS+= INSTALLSTRIP='' |