diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /package/mpfr | |
parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'package/mpfr')
-rw-r--r-- | package/mpfr/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile index a3d91b707..f4bc9982e 100644 --- a/package/mpfr/Makefile +++ b/package/mpfr/Makefile @@ -16,7 +16,13 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,MPFR_DEV,mpfr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MPFR_DEV},${PKGSC_MPFR_DEV})) +<<<<<<< HEAD mpfr-install: +======= +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) + +post-install: +>>>>>>> ed73ed80fe75787a18a3ecf2335ff62d799eba01 ${INSTALL_DIR} ${IDIR_MPFR}/usr/lib ${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib |