From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/mpfr/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'package/mpfr/Makefile')

diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 41647e0bf..eb1468706 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/mpfr/Makefile.inc
 
 PKG_NAME:=		mpfr
 PKG_DESCR:=		multi precision library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/misc
 PKG_BUILDDEP:=		gmp
 PKG_URL:=		http://www.mpfr.org/
 PKG_OPTS:=		dev
@@ -15,8 +15,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-
 mpfr-install:
 	${INSTALL_DIR} ${IDIR_MPFR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib
-- 
cgit v1.2.3