diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
| commit | 4f64f833872a6c83dd95149a553b9ed5258b4efe (patch) | |
| tree | 1d653351e49b62def18e74af5b18d6cb2a848a79 /package/libmad/Makefile | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'package/libmad/Makefile')
| -rw-r--r-- | package/libmad/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 0b708732d..58faf3463 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -21,6 +21,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV})) +#FIXME +XAKE_FLAGS+= GCC_HONOUR_COPTS=s + FPM:=default ifeq (${ARCH},i386) FPM:=intel |