diff options
36 files changed, 124 insertions, 161 deletions
@@ -13,16 +13,15 @@ Before you can start you need to install some tools: - GNU sed - tar - patch -- pkg-config - gzip - bzip2 - wget -- file - libc headers - ncurses5 headers - zlib headers - perl - bc +- xargs There is a check for the required versions of these tools in advance, though. (to re-issue the checks, use "make prereq"). diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 4f4dbf3c5..441eefb3e 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -65,6 +65,7 @@ ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) touch $@ +hostpost-install: hpkg-install: ${ALL_HOSTINST} host-install: ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} @@ -81,6 +82,7 @@ endif else env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) endif + env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE) rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) mkdir -p ${HOST_WRKINST} diff --git a/mk/image.mk b/mk/image.mk index ae5e55f98..0ce61cd01 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -189,7 +189,7 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y) echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config endif - @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE) + @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null echo N | \ $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} oldconfig $(MAKE_TRACE) diff --git a/mk/vars.mk b/mk/vars.mk index 93a9a5988..7d58fc8ef 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -145,7 +145,7 @@ CXX_FOR_BUILD?= g++ CPPFLAGS_FOR_BUILD?= -I$(STAGING_HOST_DIR)/usr/include CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) CXXFLAGS_FOR_BUILD?= -O2 -Wall -LDFLAGS_FOR_BUILD?= -L/opt/local/lib +LDFLAGS_FOR_BUILD?= -L$(STAGING_HOST_DIR)/usr/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 20c7ba1f5..5f03351c2 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0 PKG_DESCR:= image processing and converting utility PKG_SECTION:= multimedia -PKG_BUILDDEP:= libpng jpeg libtiff fontconfig libiconv libtool e2fsprogs +PKG_BUILDDEP:= libpng jpeg libtiff fontconfig libiconv-tiny libtool e2fsprogs PKG_BUILDDEP+= pango PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ diff --git a/package/autotool/Makefile b/package/autotool/Makefile index 1b3aaa3e5..8d8b8eb52 100644 --- a/package/autotool/Makefile +++ b/package/autotool/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk # meta package for host autotool infrastructure PKG_NAME:= autotool PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= autotool infrastructure for host PKG_SECTION:= devel -PKG_BUILDDEP:= m4-host pkg-config-host autoconf-host automake-host +PKG_BUILDDEP:= m4-host pkgconf-host autoconf-host automake-host PKG_BUILDDEP+= libtool-host NO_DISTFILES:= 1 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 6bad9bf9b..5c5329a9a 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -9,6 +9,7 @@ PKG_VERSION:= 1.0 PKG_RELEASE:= 61 PKG_SECTION:= base PKG_DESCR:= basic files and scripts +PKG_BUILDDEP:= pkgconf-host file-host WRKDIST= ${WRKDIR}/base-files NO_DISTFILES:= 1 diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index e77548913..e3ca9f404 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4d00c6e09859b653f955b16b988db0ac PKG_DESCR:= IRC gateway to IM chat networks PKG_SECTION:= chat -PKG_DEPENDS:= glib libiconv libopenssl -PKG_BUILDDEP:= glib libiconv openssl +PKG_DEPENDS:= glib libopenssl +PKG_BUILDDEP:= glib libiconv-tiny openssl PKG_URL:= http://www.bitlbee.org/ PKG_SITES:= http://get.bitlbee.org/src/ diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index 109675e43..bdfd80a14 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 39d27c13eae8a5064d68e20d585e60de PKG_DESCR:= mail filter PKG_SECTION:= mail -PKG_BUILDDEP:= libiconv db -PKG_DEPENDS:= libiconv libdb +PKG_BUILDDEP:= libiconv-tiny db +PKG_DEPENDS:= libdb PKG_URL:= http://bogofilter.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} PKG_NEED_CXX:= 1 diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 26a18a99b..03a6bc4d3 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 2026a2bb23b966f13893167b4dbc5d70 PKG_DESCR:= a collection of general-purpose C++ classes (libraries) PKG_SECTION:= libs -PKG_DEPENDS:= libiconv -PKG_BUILDDEP:= libiconv +PKG_BUILDDEP:= libiconv-tiny PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index b49a04fb0..1b4c0a3ff 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= c9e8aeb15daeba4b6283b40bb640e908 PKG_DESCR:= WebDAV filesystem PKG_SECTION:= net/fs -PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon -PKG_BUILDDEP:= libiconv neon fuse +PKG_DEPENDS:= fuse-utils kmod-fuse-fs neon +PKG_BUILDDEP:= libiconv-tiny neon fuse PKG_URL:= http://savannah.nongnu.org/projects/davfs2/ PKG_SITES:= http://www.very-clever.com/download/nongnu/davfs2/ @@ -21,7 +21,7 @@ $(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP CONFIGURE_ARGS+= --with-neon CONFIGURE_ENV+= LIBS=-liconv -post-install: +davfs2-install: ${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2 ${INSTALL_DIR} ${IDIR_DAVFS2}/usr/sbin $(CP) ${WRKINST}/etc/davfs2/{davfs2.conf,secrets} \ diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 518eaf549..6f427d357 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 726cd0b7a18c5e25f4d80ebeffe7607e PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps -PKG_DEPENDS:= libfltk libxi libiconv libpng zlib libjpeg +PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg PKG_DEPENDS+= libstdcxx libpthread libgcc libopenssl -PKG_BUILDDEP:= fltk libXi libiconv jpeg libpng zlib openssl +PKG_BUILDDEP:= fltk libXi libiconv-tiny jpeg libpng zlib openssl PKG_URL:= http://www.dillo.org/ PKG_SITES:= http://www.dillo.org/download/ PKG_NEED_CXX:= 1 diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index b06835552..902f1ae82 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 0a8edc63aa79377b2bf44e469d5bbbb7 PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs -PKG_DEPENDS:= libxml2 libiconv -PKG_BUILDDEP:= freetype libxml2 libiconv +PKG_DEPENDS:= libxml2 +PKG_BUILDDEP:= freetype libxml2 libiconv-tiny PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ PKG_OPTS:= dev diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 99910783b..e37daa8ac 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a0fb49ccb6b910bdbd7e76a9960394e3 PKG_DESCR:= small non-forking webserver PKG_SECTION:= www -PKG_DEPENDS:= libiconv -PKG_BUILDDEP:= libowfat libiconv +PKG_BUILDDEP:= libowfat libiconv-tiny PKG_URL:= http://www.fefe.de/gatling/ PKG_SITES:= http://dl.fefe.de/ diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 686ea3497..0c8cb1906 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -7,8 +7,8 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_NAME:= gdb PKG_DESCR:= GNU debugger PKG_SECTION:= debug -PKG_DEPENDS:= libthread-db libncurses libiconv libexpat libgcc -PKG_BUILDDEP:= ncurses readline libiconv expat +PKG_DEPENDS:= libthread-db libncurses libexpat libgcc +PKG_BUILDDEP:= ncurses readline libiconv-tiny expat PKG_NOPARALLEL:= 1 PKG_ARCH_DEPENDS:= !cris !avr32 !m68k diff --git a/package/glib/Makefile b/package/glib/Makefile index 23d0230e5..c499a747b 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -5,13 +5,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.28.1 +PKG_RELEASE:= 5 PKG_EXTRAVER:= 2.28 -PKG_RELEASE:= 4 PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs -PKG_DEPENDS:= libiconv libpthread -PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv dbus glib-host +PKG_DEPENDS:= libpthread +PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv-tiny-host +PKG_BUILDDEP:= 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 @@ -28,11 +29,9 @@ $(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})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -CONFIGURE_ARGS+= --enable-debug=no \ - --disable-mem-pools \ +CONFIGURE_ARGS+= --disable-mem-pools \ --disable-rebuilds \ --disable-fam \ - --with-libiconv=gnu \ --with-threads=posix CONFIGURE_ENV+= glib_cv_long_long_format=ll \ glib_cv_stack_grows=no \ @@ -42,8 +41,6 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getgrgid_r=yes HOST_CONFIGURE_ARGS+= --prefix=$(HOST_WRKINST)/usr \ - --with-libiconv=gnu \ - --enable-debug=no \ --disable-fam glib-hostinstall: diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 752a64f77..240249145 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 PKG_DESCR:= An UPnP music media server PKG_SECTION:= multimedia -PKG_DEPENDS:= id3lib libupnp libmagic libiconv -PKG_BUILDDEP:= id3lib libupnp file libiconv +PKG_DEPENDS:= id3lib libupnp libmagic +PKG_BUILDDEP:= id3lib libupnp file libiconv-tiny PKG_URL:= http://www.gnu.org/software/gmediaserver PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/ PKG_CXX:= GMEDIASERVER diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile index a42cd6567..1b7fff853 100644 --- a/package/gnupg/Makefile +++ b/package/gnupg/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 991faf66d3352ac1452acc393c430b23 PKG_DESCR:= Gnu Privacy Guard PKG_SECTION:= crypto -PKG_DEPENDS:= libreadline libiconv -PKG_BUILDDEP:= readline libiconv +PKG_DEPENDS:= libreadline +PKG_BUILDDEP:= readline libiconv-tiny PKG_URL:= http://www.gnupg.org/ PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/ diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index 2cd452176..389b4f39a 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7 PKG_DESCR:= An ID3v1/ID3v2 tagging library PKG_SECTION:= libs -PKG_DEPENDS:= zlib libiconv -PKG_BUILDDEP:= zlib libiconv +PKG_DEPENDS:= zlib +PKG_BUILDDEP:= zlib libiconv-tiny PKG_URL:= http://id3lib.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/} PKG_NEED_CXX:= 1 diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile new file mode 100644 index 000000000..0f91f715b --- /dev/null +++ b/package/libiconv-tiny/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libiconv-tiny +PKG_VERSION:= 0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7211794e2fa1df4123c5cc9f9226a5bb +PKG_DESCR:= iconv stub and replacement +PKG_SECTION:= libs +PKG_URL:= http://www.openwrt.org/ +PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_OPTS:= dev devonly + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,LIBICONV_TINY,libiconv-tiny,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBICONV_TINY,libiconv-tiny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +HOST_STYLE:= manual +CONFIG_STYLE:= manual + +libiconv-tiny-hostinstall: + $(CP) $(WRKBUILD)/libiconv.a $(STAGING_HOST_DIR)/usr/lib + $(CP) $(WRKBUILD)/include/* $(STAGING_HOST_DIR)/usr/include + $(CP) $(WRKBUILD)/charmaps $(STAGING_HOST_DIR)/usr/include + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal + $(CP) $(WRKBUILD)/m4/iconv.m4 \ + $(STAGING_HOST_DIR)/usr/share/aclocal + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile deleted file mode 100644 index 62cbeb0ee..000000000 --- a/package/libiconv/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= libiconv -PKG_VERSION:= 1.14 -PKG_RELEASE:= 1 -PKG_MD5SUM:= e34509b1623cec449dfeb73d7ce9c6c6 -PKG_DESCR:= character set conversion library -PKG_SECTION:= libs -PKG_URL:= http://www.gnu.org/software/libiconv/ -PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/} -PKG_OPTS:= dev - -ifeq ($(ADK_STATIC),y) -PKG_OPTS+= libonly -endif - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -libiconv-install: - ${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib - ${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/libcharset.so* ${IDIR_LIBICONV}/usr/lib/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libiconv/patches/patch-srclib_stdio_in_h b/package/libiconv/patches/patch-srclib_stdio_in_h deleted file mode 100644 index 72c920ad3..000000000 --- a/package/libiconv/patches/patch-srclib_stdio_in_h +++ /dev/null @@ -1,29 +0,0 @@ ---- libiconv-1.14.orig/srclib/stdio.in.h 2011-08-07 15:42:06.000000000 +0200 -+++ libiconv-1.14/srclib/stdio.in.h 2013-10-24 16:56:53.000000000 +0200 -@@ -679,22 +679,11 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - diff --git a/package/moc/Makefile b/package/moc/Makefile index 2b385c9ca..a5849b1de 100644 --- a/package/moc/Makefile +++ b/package/moc/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0 PKG_DESCR:= console music player PKG_SECTION:= multimedia -PKG_DEPENDS:= libmad libvorbis libcurl libflac libiconv +PKG_DEPENDS:= libmad libvorbis libcurl libflac PKG_DEPENDS+= libncurses libid3tag -PKG_BUILDDEP:= ncurses libvorbis curl libmad flac libiconv +PKG_BUILDDEP:= ncurses libvorbis curl libmad flac libiconv-tiny PKG_BUILDDEP+= libid3tag db PKG_URL:= http://moc.daper.net/ PKG_SITES:= ftp://ftp.daper.net/pub/soft/moc/unstable/ diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index 4b293376b..e70519cc6 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 4 PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb PKG_DESCR:= bluetooth ftp application PKG_SECTION:= bluetooth -PKG_DEPENDS:= openobex libiconv libobexftp libbluetooth -PKG_BUILDDEP:= openobex libiconv +PKG_DEPENDS:= openobex libobexftp libbluetooth +PKG_BUILDDEP:= openobex libiconv-tiny PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} PKG_LIBNAME:= libobexftp diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index d49fe8b22..9313c91a0 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -16,7 +16,7 @@ PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 \ PKG_DESCR:= OpenJDK Java VM PKG_SECTION:= lang PKG_BUILDDEP:= alsa-lib xproto jpeg zlib giflib libpng freetype cups -PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv +PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi PKG_URL:= http://openjdk.org/ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 8fa2aff9c..d3b630c83 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e96e5e578d442d3ae56cd332e8dbc6b6 PKG_DESCR:= OpenJDK 7 Java VM PKG_SECTION:= lang PKG_BUILDDEP:= alsa-lib xproto jpeg zlib giflib libpng freetype cups -PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv +PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc PKG_URL:= http://openjdk.org/ PKG_SITES:= http://icedtea.classpath.org/download/source/ diff --git a/package/pkg-config/Makefile b/package/pkg-config/Makefile deleted file mode 100644 index 875e95621..000000000 --- a/package/pkg-config/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= pkg-config -PKG_VERSION:= 0.28 -PKG_RELEASE:= 2 -PKG_MD5SUM:= aa3c86e67551adc3ac865160e34a2a0d -PKG_DESCR:= a helper tool used when compiling applications and libraries. -PKG_SECTION:= lang -PKG_DEPENDS:= glib libpopt -PKG_BUILDDEP:= glib popt pkg-config-host -PKG_URL:= http://pkg-config.freedesktop.org/wiki/ -PKG_SITES:= http://pkgconfig.freedesktop.org/releases/ - -include $(TOPDIR)/mk/host.mk -include $(TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,PKG_CONFIG,pkg-config,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,PKG_CONFIG,pkg-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --with-internal-glib \ - --disable-host-tool -CONFIGURE_ARGS+= --with-installed-glib \ - --with-installed-popt - -pkg-config-install: - $(INSTALL_DIR) $(IDIR_PKG_CONFIG)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/pkg-config \ - $(IDIR_PKG_CONFIG)/usr/bin - -include ${TOPDIR}/mk/host-bottom.mk -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile new file mode 100644 index 000000000..b1131003a --- /dev/null +++ b/package/pkgconf/Makefile @@ -0,0 +1,35 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pkgconf +PKG_VERSION:= 0.9.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 52c553bad686f8be1556b58bc1925f4f +PKG_DESCR:= smart pkg-config replacement +PKG_SECTION:= lang +PKG_URL:= https://github.com/pkgconf/pkgconf +PKG_SITES:= http://rabbit.dereferenced.org/~nenolod/distfiles/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PKGCONF,pkgconf,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,PKGCONF,pkgconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +HOST_STYLE:= auto + +hostpost-install: + (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf pkg-config) + +pkgconf-install: + $(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/pkgconf \ + $(IDIR_PKGCONF)/usr/bin + (cd $(IDIR_PKGCONF)/usr/bin && ln -sf pkgconf pkg-config) + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/popt/Makefile b/package/popt/Makefile index 398aeae38..c8237930e 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 4 PKG_MD5SUM:= 3743beefa3dd6247a73f8f7a32c14c33 PKG_DESCR:= a command line option parsing library PKG_SECTION:= libs -PKG_DEPENDS:= libiconv -PKG_BUILDDEP:= libiconv +PKG_BUILDDEP:= libiconv-tiny PKG_URL:= http://rpm5.org/ PKG_SITES:= http://rpm5.org/files/popt/ PKG_LIBNAME:= libpopt diff --git a/package/rdesktop/Makefile b/package/rdesktop/Makefile index 971183f59..18b8169d1 100644 --- a/package/rdesktop/Makefile +++ b/package/rdesktop/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c6fcbed7f0ad7e60ac5fcb2d324d8b16 PKG_DESCR:= client for Windows Terminal Services PKG_SECTION:= net -PKG_BUILDDEP:= libiconv openssl +PKG_BUILDDEP:= libiconv-tiny openssl PKG_URL:= http://www.rdesktop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rdesktop/} diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 4bc97d4aa..1551e7b03 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 17fe81c30fe0f785b2100ebadb3dc580 PKG_DESCR:= revision control program PKG_SECTION:= scm -PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite neon -PKG_BUILDDEP:= apr-util expat apr zlib libiconv sqlite neon +PKG_DEPENDS:= zlib apr apr-util libexpat libsqlite neon +PKG_BUILDDEP:= apr-util expat apr zlib libiconv-tiny sqlite neon PKG_URL:= http://subversion.apache.org/ PKG_SITES:= http://artfiles.org/apache.org/subversion/ diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index a7237bbc1..923f350dc 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a9c85aa6d624f7f88c48374f28730242 PKG_DESCR:= small C++ application server PKG_SECTION:= www -PKG_DEPENDS:= cxxtools zlib libiconv libpthread -PKG_BUILDDEP:= cxxtools zlib libiconv +PKG_DEPENDS:= cxxtools zlib libpthread +PKG_BUILDDEP:= cxxtools zlib libiconv-tiny PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile index f6454cab2..2ea2c2dbb 100644 --- a/package/vilistextum/Makefile +++ b/package/vilistextum/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 5ba56ffdc56758da716bb46c3e0f517e PKG_DESCR:= html to ascii converter PKG_SECTION:= mail -PKG_DEPENDS:= libiconv -PKG_BUILDDEP:= libiconv +PKG_BUILDDEP:= libiconv-tiny PKG_SITES:= http://bhaak.dyndns.org/${PKG_NAME}/ include ${TOPDIR}/mk/package.mk diff --git a/package/weechat/Makefile b/package/weechat/Makefile index beab50467..326d44ee0 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 0c4f6e7196703c6eca12217f254612aa PKG_DESCR:= Lightweight IRC client PKG_SECTION:= chat -PKG_DEPENDS:= libncurses libiconv -PKG_BUILDDEP:= ncurses libiconv +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses libiconv-tiny PKG_URL:= http://www.weechat.org/ PKG_SITES:= http://www.weechat.org/files/src/ diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index a587e5ad3..0b7b1d08c 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -213,12 +213,6 @@ if ! which wget >/dev/null 2>&1; then out=1 fi -if ! which file >/dev/null 2>&1; then - echo You must install \"file\" to continue. - echo - out=1 -fi - if ! which perl >/dev/null 2>&1; then echo You must install perl to continue. echo @@ -231,14 +225,14 @@ if ! which m4 >/dev/null 2>&1; then out=1 fi -if ! which pkg-config >/dev/null 2>&1; then - echo "You need pkg-config to continue." +if ! which bc >/dev/null 2>&1; then + echo "You need bc to continue." echo out=1 fi -if ! which bc >/dev/null 2>&1; then - echo "You need bc to continue." +if ! which xargs >/dev/null 2>&1; then + echo "You need xargs to continue." echo out=1 fi diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 143166acd..72e0777ce 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -25,10 +25,8 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_MAKE select ADK_PACKAGE_MKFONTDIR select ADK_PACKAGE_PATCH - select ADK_PACKAGE_PKG_CONFIG + select ADK_PACKAGE_PKGCONF select ADK_PACKAGE_MICROPERL - select ADK_PACKAGE_TSORT - select BUSYBOX_PATCH select BUSYBOX_STAT select BUSYBOX_FEATURE_STAT_FORMAT select BUSYBOX_FEATURE_DD_IBS_OBS |