diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | package/firefox/Makefile | 3 | ||||
| -rw-r--r-- | package/zip/Makefile | 16 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 38 |
4 files changed, 17 insertions, 43 deletions
@@ -225,9 +225,6 @@ NO_ERROR=0 @echo "_PATH:=$$PATH" >>prereq.mk @echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk @echo "SHELL:=$$(which bash)" >>prereq.mk - @echo "BUILD_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk - @PKGCFGDIR=$$(eval pkg-config --variable pc_path pkg-config 2>/dev/null) >/dev/null ; \ - echo "PKG_HOSTLIB_DIR:=$${PKGCFGDIR:-/usr/lib/pkgconfig}" >>prereq.mk @env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \ CC='${CC}' CPPFLAGS='${CPPFLAGS}' \ bash scripts/scan-tools.sh 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 diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 874ee63a7..c90760b6e 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -69,17 +69,11 @@ if [[ -n $ADK_COMPILE_ORBIT2 ]]; then NEED_LIBIDL="$NEED_LIBIDL orbit2" fi -if [[ -n $ADK_PACKAGE_FIREFOX ]]; then - NEED_LIBIDL="$NEED_LIBIDL firefox" - NEED_ZIP="$NEED_ZIP firefox" -fi - if [[ -n $ADK_PACKAGE_MESALIB ]]; then NEED_MAKEDEPEND="$NEED_MAKEDEPEND mesalib" fi if [[ -n $ADK_COMPILE_OPENJDK ]]; then - NEED_ZIP="$NEED_ZIP openjdk" NEED_GXX="$NEED_GXX openjdk" NEED_XSLTPROC="$NEED_XSLTPROC openjdk" fi @@ -90,10 +84,6 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then fi if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then - NEED_ZIP="$NEED_ZIP openjdk7" -fi - -if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then cd ${TOPDIR}/jtools; bash prereq.sh [ $? -ne 0 ] && out=1 fi @@ -131,10 +121,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi -if [[ -n $ADK_PACKAGE_GLIB ]]; then - NEED_GETTEXT="$NEED_GETTEXT glib" -fi - if [[ -n $ADK_PACKAGE_YAJL ]]; then NEED_RUBY="$NEED_RUBY yajl" fi @@ -160,16 +146,6 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi" fi -if [[ -n $NEED_GETTEXT ]]; then - if ! which gettext >/dev/null 2>&1; then - echo >&2 You need gettext to build $NEED_GETTEXT - out=1 - elif ! which msgfmt >/dev/null 2>&1; then - echo >&2 You need msgfmt to build $NEED_GETTEXT - out=1 - fi -fi - if [[ -n $NEED_LIBTIRPCDEV ]];then if ! test -f /usr/include/tirpc/netconfig.h >/dev/null; then echo >&2 You need tirpc headers to build $NEED_LIBTIRPCDEV @@ -304,20 +280,6 @@ if [[ -n $NEED_WWW ]]; then fi fi -if [[ -n $NEED_ZIP ]]; then - if ! which zip >/dev/null 2>&1; then - echo >&2 You need zip to build $NEED_ZIP - out=1 - fi -fi - -if [[ -n $NEED_LIBIDL ]]; then - if ! which libIDL-config-2 >/dev/null 2>&1; then - echo >&2 You need libIDL-config-2 to build $NEED_LIBIDL - out=1 - fi -fi - if [[ -n $NEED_SWIG ]]; then if ! which swig >/dev/null 2>&1; then echo >&2 You need swig to build $NEED_SWIG |