diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-04 13:53:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-04 13:53:08 +0100 |
| commit | 8b3dac771af71587d791d7a8171c2b4036afea10 (patch) | |
| tree | 644c0eebc8cc73d56bfef111d711b4b0028ad97a /package/glib | |
| parent | 22e24d73762b2cfc79797f94d9e2d9e3f070c418 (diff) | |
resolve merge conflict, second try
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index c499a747b..87fd9d50a 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -28,6 +28,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call HOST_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-mem-pools \ --disable-rebuilds \ @@ -43,14 +44,6 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ HOST_CONFIGURE_ARGS+= --prefix=$(HOST_WRKINST)/usr \ --disable-fam -glib-hostinstall: - $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-compile-schemas \ - ${STAGING_HOST_DIR}/usr/bin - $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-genmarshal \ - ${STAGING_HOST_DIR}/usr/bin - $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/glib-mkenums \ - ${STAGING_HOST_DIR}/usr/bin - glib-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib |