summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUGS5
-rw-r--r--Makefile3
-rw-r--r--README3
-rw-r--r--TODO2
-rw-r--r--package/autoconf/Makefile2
-rw-r--r--package/automake/Makefile2
-rw-r--r--package/bison/Makefile2
-rw-r--r--package/firefox/Makefile5
-rw-r--r--package/gdk-pixbuf/Makefile2
-rw-r--r--package/gettext-tiny/Makefile1
-rw-r--r--package/glib/Makefile3
-rw-r--r--package/libIDL/Makefile2
-rw-r--r--package/libiconv-tiny/Makefile1
-rw-r--r--package/libtool/Makefile1
-rw-r--r--package/libvpx/Makefile1
-rw-r--r--package/m4/Makefile1
-rw-r--r--package/yasm/Makefile10
-rw-r--r--package/zip/Makefile16
-rw-r--r--scripts/scan-pkgs.sh52
-rw-r--r--scripts/scan-tools.sh12
20 files changed, 49 insertions, 77 deletions
diff --git a/BUGS b/BUGS
index 20f48acdc..e8cfe7fd2 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,2 @@
-- qemu-sparc with eglibc does not compile
-- qemu-ppc64 does not boot
+- uclibc N64 ABI on mips64{,el} targets does not work, nptl fork problem
- cris foxboard-lx is broken, binutils failure
-- uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
-- qemu-mips64* targets does not boot, kernel problem?
diff --git a/Makefile b/Makefile
index 49623ffe0..2658c12dd 100644
--- a/Makefile
+++ b/Makefile
@@ -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/README b/README
index c46e0a167..7d6b5bb6d 100644
--- a/README
+++ b/README
@@ -15,6 +15,9 @@ Before you can start you need to install some tools:
- patch
- gzip
- bzip2
+- lzop
+- lzma
+- xz
- wget
- libc headers
- ncurses5 headers
diff --git a/TODO b/TODO
index fc457fa92..57ab4fb30 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+- use host-tools infrastructure for openjdk7
+- remove openjdk6
- evaluate libguestfs for image creation
- add grsec kernel patch
- check for gcc and SSP again
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index 389c3efd5..6813142bb 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 82d05e03b93e45f5a39b828dc9c6c29b
PKG_DESCR:= GNU autoconf
PKG_SECTION:= lang
-PKG_BUILDDEP:= m4-host
+PKG_BUILDDEP:= m4-host autoconf-host
PKG_URL:= http://www.gnu.org/software/autoconf/
PKG_SITES:= ${MASTER_SITE_GNU:=autoconf/}
PKG_OPTS:= noscripts
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 7c12ded6e..acc41cc8a 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -10,7 +10,7 @@ PKG_EXTRAVER:= 1.12
PKG_MD5SUM:= e620cb9e0259159341c0e0d6b712b67a
PKG_DESCR:= GNU automake
PKG_SECTION:= lang
-PKG_BUILDDEP:= autoconf-host
+PKG_BUILDDEP:= autoconf-host automake-host
PKG_URL:= http://www.gnu.org/software/automake/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
PKG_OPTS:= noscripts
diff --git a/package/bison/Makefile b/package/bison/Makefile
index aaef1b631..182e10310 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= ea45c778b36bdc7a720096819e292a73
PKG_DESCR:= GNU parser generator
PKG_SECTION:= lang
+PKG_BUILDDEP:= flex-host bison-host
PKG_URL:= http://www.gnu.org/software/bison/
PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
@@ -19,7 +20,6 @@ $(eval $(call HOST_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
HOST_STYLE:= auto
-#XAKE_FLAGS+= M4=m4
bison-install:
${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 3a21a2d80..69df75db1 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -15,7 +15,8 @@ PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf li
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
+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/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index 719f614ca..66859b04c 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= bd7c2a9d23b573db467e39833f12103d
PKG_DESCR:= GDK pixbuf library
PKG_SECTION:= libs
-PKG_BUILDDEP:= jpeg libtiff
+PKG_BUILDDEP:= libjpeg-turbo libtiff
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/
PKG_NEED_CXX:= 1
PKG_OPTS:= dev
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index 6a98b123f..71fdda509 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 3af6fd8a9042603b61f634b1c6f49e7e
PKG_DESCR:= Gettext stub and replacement
PKG_SECTION:= libs
+PKG_BUILDDEP:= gettext-tiny-host
PKG_URL:= https://github.com/rofl0r/gettext-tiny
PKG_SITES:= http://ftp.barfooze.de/pub/sabotage/tarballs/
PKG_OPTS:= dev
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 87fd9d50a..842712601 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -11,8 +11,7 @@ PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
PKG_DEPENDS:= libpthread
-PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv-tiny-host
-PKG_BUILDDEP:= libiconv-tiny glib-host zlib
+PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host zlib
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index 983d6b865..58a6f7434 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 531fbc1b40b80dd1d6f3b5e76b99067c
PKG_DESCR:= libraries for Interface Definition Language files
PKG_SECTION:= libs
PKG_DEPENDS:= glib
-PKG_BUILDDEP:= glib
+PKG_BUILDDEP:= glib flex-host bison-host
PKG_URL:= http://www.gnome.org/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
PKG_LIBNAME:= libidl
diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile
index 3b88a24e1..d5da1049f 100644
--- a/package/libiconv-tiny/Makefile
+++ b/package/libiconv-tiny/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 4898b62aebc1614edab60bf1fe0ac661
PKG_DESCR:= iconv stub and replacement
PKG_SECTION:= libs
+PKG_BUILDDEP:= libiconv-tiny-host
PKG_URL:= http://www.openwrt.org/
PKG_SITES:= http://www.openadk.org/distfiles/
PKG_OPTS:= dev devonly
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index b2710ee63..adfd6f4cc 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= d2f3b7d4627e69e13514a40e72a24d50
PKG_DESCR:= a generic dynamic object loading library
PKG_SECTION:= lang
+PKG_BUILDDEP:= libtool-host
PKG_URL:= http://www.gnu.org/software/libtool/
PKG_SITES:= ${MASTER_SITE_GNU:=libtool/}
PKG_LIBNAME:= libltdl
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index 13796e7d5..98ceb7575 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= f8de058e6ba14555144583a2d031fe19
PKG_DESCR:= VP8/VP9 codec library
PKG_SECTION:= libs
+PKG_BUILDDEP:= yasm-host
PKG_URL:= http://www.webmproject.org/about/
PKG_SITES:= http://webm.googlecode.com/files/
PKG_OPTS:= dev
diff --git a/package/m4/Makefile b/package/m4/Makefile
index 2d6516d25..b4b25b6e3 100644
--- a/package/m4/Makefile
+++ b/package/m4/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= a5dfb4f2b7370e9d34293d23fd09b280
PKG_DESCR:= macro processor
PKG_SECTION:= lang
+PKG_BUILDDEP:= m4-host
PKG_URL:= http://www.gnu.org/software/m4/
PKG_SITES:= ${MASTER_SITE_GNU:=m4/}
diff --git a/package/yasm/Makefile b/package/yasm/Makefile
index 7567b5d9b..bd9d7d716 100644
--- a/package/yasm/Makefile
+++ b/package/yasm/Makefile
@@ -4,20 +4,26 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= yasm
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.2.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8392e5f2235c2c2a981e1a633f2698cb
+PKG_MD5SUM:= 4cfc0686cf5350dd1305c4d905eb55a6
PKG_DESCR:= Modular Assembler Project
PKG_SECTION:= misc
+PKG_BUILDDEP:= yasm-host
PKG_URL:= http://www.tortall.net/projects/yasm/
PKG_SITES:= http://www.tortall.net/projects/yasm/releases/
+include $(TOPDIR)/mk/host.mk
include $(TOPDIR)/mk/package.mk
+$(eval $(call HOST_template,YASM,yasm,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,YASM,yasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+HOST_STYLE:= auto
+
yasm-install:
$(INSTALL_DIR) $(IDIR_YASM)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/yasm $(IDIR_YASM)/usr/bin
+include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
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 2784f6c1c..c90760b6e 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -65,26 +65,15 @@ if [[ -n $ADK_PACKAGE_LIBX11 ]]; then
NEED_X11="$NEED_X11 libx11"
fi
-if [[ -n $ADK_PACKAGE_LIBVPX ]]; then
- NEED_YASM="$NEED_YASM libvpx"
-fi
-
if [[ -n $ADK_COMPILE_ORBIT2 ]]; then
NEED_LIBIDL="$NEED_LIBIDL orbit2"
fi
-if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
- NEED_YASM="$NEED_YASM firefox"
- 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
@@ -95,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
@@ -136,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
@@ -165,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
@@ -309,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
@@ -365,15 +322,6 @@ if [[ -n $NEED_RPM ]]; then
fi
fi
-if [[ -n $ADK_LINUX_X86 ]]; then
- if [[ -n $NEED_YASM ]]; then
- if ! which yasm >/dev/null 2>&1; then
- echo >&2 You need yasm to build $NEED_YASM
- out=1
- fi
- fi
-fi
-
if [[ -n $NEED_XSLTPROC ]]; then
if ! which xsltproc >/dev/null 2>&1; then
echo >&2 You need xsltproc to build $NEED_XSLTPROC
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 0b7b1d08c..a060d24fc 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -112,6 +112,12 @@ if ! which gzip >/dev/null 2>&1; then
out=1
fi
+if ! which bzip2 >/dev/null 2>&1; then
+ echo You must install bzip2 to continue.
+ echo
+ out=1
+fi
+
if ! which lzop >/dev/null 2>&1; then
echo You must install lzop to continue.
echo
@@ -130,12 +136,6 @@ if ! which xz >/dev/null 2>&1; then
out=1
fi
-if ! which bzip2 >/dev/null 2>&1; then
- echo You must install bzip2 to continue.
- echo
- out=1
-fi
-
if ! which patch >/dev/null 2>&1; then
echo You must install patch to continue.
echo
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 02:52:43 +0000