diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-14 10:01:21 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-14 10:01:21 +0100 |
| commit | 7b23ed2098a6fa8f2741b6b5b84310fd9bb4f872 (patch) | |
| tree | 2f8399c6481d03d860d2c698cedb2f6edff9c082 /package | |
| parent | 1d6e936d172a92d055a39dce5cb6e7e478c8080e (diff) | |
remove zip and libIDL dependency, firefox does not need libIDL anymore. need to fix orbit2
Diffstat (limited to 'package')
| -rw-r--r-- | package/firefox/Makefile | 3 | ||||
| -rw-r--r-- | package/zip/Makefile | 16 |
2 files changed, 17 insertions, 2 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 8eb84d7b1..69df75db1 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -16,6 +16,7 @@ PKG_DEPENDS+= harfbuzz mesalib libvpx libbz2 ca-certificates libevent PKG_BUILDDEP:= alsa-lib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent python2-host yasm-host +PKG_BUILDDEP+= zip-host PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ PKG_NOPARALLEL:= 1 @@ -46,8 +47,6 @@ CONFIGURE_ENV+= CROSS_COMPILE=1 \ HOST_LDFLAGS="${LDLAGS_FOR_BUILD}" \ HOST_CXX="${CXX_FOR_BUILD}" \ HOST_CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ - BUILD_LIBIDL_CONFIG="${BUILD_LIBIDL_CONFIG}" \ - PKG_HOSTLIB_DIR="${PKG_HOSTLIB_DIR}" \ HOST_RANLIB="ranlib" HOST_AR="ar" \ CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ ac_cv_sqlite_secure_delete=yes \ diff --git a/package/zip/Makefile b/package/zip/Makefile index 1cc0f8ec0..242fc84ec 100644 --- a/package/zip/Makefile +++ b/package/zip/Makefile @@ -9,16 +9,20 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7b74551e63f8ee6aab6fbc86676c0d37 PKG_DESCR:= zip compression utility PKG_SECTION:= archive +PKG_BUILDDEP:= zip-host PKG_URL:= http://www.info-zip.org/Zip.html PKG_SITES:= ftp://ftp.info-zip.org/pub/infozip/src/ WRKDIST= $(WRKDIR)/$(PKG_NAME)30 DISTFILES:= $(PKG_NAME)30.tgz +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,ZIP,zip,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,ZIP,zip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= manual CONFIG_STYLE:= minimal INSTALL_STYLE:= manual @@ -27,8 +31,20 @@ CONFIGURE_PROG:= unix/configure MAKE_FILE:= unix/Makefile ALL_TARGET:= generic_gcc +host-configure: + (cd $(WRKBUILD) && $(BASH) $(CONFIGURE_PROG)) + +host-build: + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_MAKE_FLAGS} ${ALL_TARGET}) + +zip-hostinstall: + $(CP) $(WRKBUILD)/zip \ + $(STAGING_HOST_DIR)/usr/bin + zip-install: ${INSTALL_DIR} ${IDIR_ZIP}/usr/bin ${CP} ${WRKBUILD}/zip ${IDIR_ZIP}/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |