diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Config.in | 49 | ||||
| -rw-r--r-- | package/grub-bin/Makefile | 3 | ||||
| -rw-r--r-- | package/grub/Makefile | 2 | ||||
| -rw-r--r-- | package/mpd/Makefile | 9 | ||||
| -rw-r--r-- | package/mplayer/Makefile | 6 | ||||
| -rw-r--r-- | package/ncurses/Makefile | 8 | ||||
| -rw-r--r-- | package/pkgmaker | 2 |
7 files changed, 63 insertions, 16 deletions
diff --git a/package/Config.in b/package/Config.in index e4c5288c3..9693e27b0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -410,7 +410,9 @@ source "package/gtk+/Config.in" source "package/id3lib/Config.in" source "package/libao/Config.in" source "package/libaudiofile/Config.in" +source "package/libaudiofile/Config.in.lib" source "package/libart/Config.in" +source "package/libart/Config.in.lib" source "package/linux-atm/Config.in.lib" source "package/libcli/Config.in" source "package/libdaemon/Config.in" @@ -427,8 +429,11 @@ source "package/faad2/Config.in.lib" source "package/flac/Config.in" source "package/flac/Config.in.lib" source "package/freetype/Config.in" +source "package/freetype/Config.in.lib" source "package/libgcrypt/Config.in" +source "package/libgcrypt/Config.in.lib" source "package/libgd/Config.in" +source "package/libgd/Config.in.lib" source "package/gdbm/Config.in" source "package/gdbm/Config.in.lib" source "package/libgssglue/Config.in" @@ -440,27 +445,36 @@ source "package/libgpg-error/Config.in" source "package/gsm/Config.in" source "package/gsm/Config.in.lib" source "package/libiconv/Config.in" +source "package/libiconv/Config.in.lib" source "package/libid3tag/Config.in" +source "package/libid3tag/Config.in.lib" source "package/jpeg/Config.in" source "package/jpeg/Config.in.lib" source "package/lame/Config.in.lib" source "package/mpfr/Config.in" source "package/nspr/Config.in" source "package/nss/Config.in" -source "package/libtool/Config.in" # libltdl +source "package/libtool/Config.in" source "package/openldap/Config.in.lib" source "package/liblzo/Config.in" +source "package/liblzo/Config.in.lib" source "package/libmad/Config.in" +source "package/libmad/Config.in.lib" source "package/libmms/Config.in" -source "package/ncurses/Config.in" # libncurses +source "package/libmms/Config.in.lib" +source "package/ncurses/Config.in" +source "package/ncurses/Config.in.lib" source "package/neon/Config.in" source "package/libnet/Config.in" +source "package/libnet/Config.in.lib" source "package/libnfsidmap/Config.in" source "package/libnids/Config.in" source "package/libnl/Config.in" source "package/libogg/Config.in" +source "package/libogg/Config.in.lib" source "package/libol/Config.in" -source "package/opencdk/Config.in" # libopencdk +source "package/libol/Config.in.lib" +source "package/opencdk/Config.in" source "package/obexftp/Config.in.lib" source "package/openobex/Config.in" source "package/libosip2/Config.in" @@ -471,13 +485,18 @@ source "package/libpri/Config.in" source "package/pango/Config.in" source "package/pcre/Config.in" source "package/libpng/Config.in" +source "package/libpng/Config.in.lib" source "package/popt/Config.in" +source "package/popt/Config.in.lib" source "package/postgresql/Config.in" +source "package/postgresql/Config.in.lib" source "package/libpthread/Config.in" +source "package/libpthread/Config.in.lib" source "package/libthread_db/Config.in" source "package/readline/Config.in" source "package/cyrus-sasl/Config.in.lib" source "package/speex/Config.in" +source "package/openssl/Config.in.lib" source "package/sqlite/Config.in.lib" source "package/librpcsecgss/Config.in" source "package/libshout/Config.in" @@ -490,13 +509,20 @@ source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libupnp/Config.in" source "package/libusb/Config.in" +source "package/libusb/Config.in.lib" source "package/libusb-compat/Config.in" +source "package/libusb-compat/Config.in.lib" source "package/libvirt/Config.in" +source "package/libvirt/Config.in.lib" source "package/libvorbis/Config.in" +source "package/libvorbis/Config.in.lib" source "package/libvorbisidec/Config.in" +source "package/libvorbisidec/Config.in.lib" source "package/tcp_wrappers/Config.in" source "package/libxml2/Config.in" +source "package/libxml2/Config.in.lib" source "package/libxslt/Config.in" +source "package/libxslt/Config.in.lib" source "package/lua/Config.in.lib" source "package/uclibc++/Config.in.manual" source "package/ustl/Config.in" @@ -510,22 +536,39 @@ source "package/xf86-video-geode/Config.in" menu "X Libraries" source "package/libICE/Config.in" +source "package/libICE/Config.in.lib" source "package/libSM/Config.in" +source "package/libSM/Config.in.lib" source "package/libX11/Config.in" +source "package/libX11/Config.in.lib" source "package/libXv/Config.in" +source "package/libXv/Config.in.lib" source "package/libXdmcp/Config.in" +source "package/libXdmcp/Config.in.lib" source "package/libXext/Config.in" +source "package/libXext/Config.in.lib" source "package/libXfont/Config.in" +source "package/libXfont/Config.in.lib" source "package/libfontenc/Config.in" +source "package/libfontenc/Config.in.lib" source "package/libpciaccess/Config.in" +source "package/libpciaccess/Config.in.lib" source "package/libxkbfile/Config.in" +source "package/libxkbfile/Config.in.lib" source "package/libXau/Config.in" +source "package/libXau/Config.in.lib" source "package/libXaw/Config.in" +source "package/libXaw/Config.in.lib" source "package/libXmu/Config.in" +source "package/libXmu/Config.in.lib" source "package/libXpm/Config.in" +source "package/libXpm/Config.in.lib" source "package/libXrender/Config.in" +source "package/libXrender/Config.in.lib" source "package/libXt/Config.in" +source "package/libXt/Config.in.lib" source "package/libXxf86dga/Config.in" +source "package/libXxf86dga/Config.in.lib" source "package/pixman/Config.in" #source "package/xf86dga/Config.in" source "package/xkbcomp/Config.in" diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 1c48a0b06..0ae841ec6 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -13,7 +13,8 @@ PKG_DESCR:= GRUB bootloader PKG_SECTION:= sys PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu +PKG_TARGET_DEPENDS:= x86 x86_64 +CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT include ${TOPDIR}/mk/package.mk diff --git a/package/grub/Makefile b/package/grub/Makefile index d4ef5f10d..894910f16 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/ PKG_HOST_DEPENDS:= linux -PKG_TARGET_DEPENDS:= shuttle wrap alix1c alix2d x86_qemu x86_64_qemu +PKG_TARGET_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/mpd/Makefile b/package/mpd/Makefile index f4ccc4be5..0468e7b62 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -6,11 +6,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.15.6 PKG_RELEASE:= 1 -PKG_BUILDDEP+= alsa-lib glib PKG_MD5SUM:= c78b8933e4902c5dc407d59925f8b10e PKG_DESCR:= A music player daemon PKG_SECTION:= net PKG_DEPENDS:= glib +PKG_BUILDDEP+= glib +ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),) +PKG_BUILDDEP+= alsa-lib +endif ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),) PKG_BUILDDEP+= libid3tag libmad endif @@ -30,7 +33,7 @@ ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),) PKG_BUILDDEP+= libaudiofile endif ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),) -PKG_BUILDDEP+= lame +PKG_BUILDDEP+= lame libvorbis endif ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),) PKG_BUILDDEP+= curl @@ -88,7 +91,7 @@ PKG_DEPENDS+= libaudiofile endif ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},) -PKG_DEPENDS+= libshout liblame +PKG_DEPENDS+= libshout liblame libvorbisenc endif ifneq (${ADK_PACKAGE_MPD_WITH_CURL},) diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index a938466e9..c0a7bff9c 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -9,8 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7 PKG_DESCR:= popular video player PKG_SECTION:= video -PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg libx11 libxv -PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng +PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses libogg libpng libpthread libvorbis +PKG_DEPENDS+= libx11 libxext libxv zlib +PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng libXext PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ @@ -99,7 +100,6 @@ pre-configure: ${CONFIGURE_DEBUG} \ ); - post-install: ${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin ${CP} ${WRKINST}/usr/bin/mplayer ${IDIR_MPLAYER}/usr/bin diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 9e9ddf9b5..dcdef3763 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= cce05daf61a64501ef6cd8da1f727ec6 PKG_DESCR:= a terminal handling library and common terminal definitions PKG_SECTION:= libs -PKG_URL:= http://www.gnu.org/software/ncurses +PKG_URL:= http://www.gnu.org/software/ncurses/ PKG_SITES:= ${MASTER_SITE_GNU:=ncurses/} include ${TOPDIR}/mk/package.mk @@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_linux_vers=2 CONFIGURE_ARGS+= --without-cxx \ --without-cxx-binding \ @@ -38,8 +38,8 @@ CONFIGURE_ARGS+= --without-cxx \ --without-rcs-ids \ --enable-const \ --enable-echo -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data diff --git a/package/pkgmaker b/package/pkgmaker index 9ed51b741..4a6ed12a0 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -139,7 +139,7 @@ for dn in */Makefile; do sp=' ' fi for x in $PKG_TARGET_DEPENDS; do - x=${x#!} + typeset -l x=${x#!} #XXX cache this with mksh R40+ found=0 while read friendlyname sym; do |