diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /package/cmake/Makefile | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/cmake/Makefile')
| -rw-r--r-- | package/cmake/Makefile | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/package/cmake/Makefile b/package/cmake/Makefile index 6cdf53b0b..c444eba19 100644 --- a/package/cmake/Makefile +++ b/package/cmake/Makefile @@ -12,13 +12,12 @@ PKG_SECTION:= lang PKG_URL:= http://www.cmake.org/ PKG_SITES:= http://www.cmake.org/files/v2.8/ -PKG_CFLINE_CMAKE:= depends on ADK_BROKEN +PKG_CFLINE_CMAKE:= depends on ADK_HOST_ONLY include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) HOST_STYLE:= manual CONFIG_STYLE:= manual @@ -35,13 +34,5 @@ cmake-hostinstall: $(INSTALL_BIN) $(WRKBUILD)/bin/cmake \ $(STAGING_HOST_DIR)/usr/bin -do-configure: - (cd $(WRKBUILD); ./configure --prefix=/usr) - -cmake-install: - $(INSTALL_DIR) $(IDIR_CMAKE)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/cmake \ - $(IDIR_CMAKE)/usr/bin - include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |