diff options
40 files changed, 46 insertions, 93 deletions
@@ -7,8 +7,6 @@ toolchain stuff: - check for gcc and SSP - config.site/config.cache usage for speedup? http://lists.gnu.org/archive/html/autoconf/2014-03/msg00031.html -- fixup rework libgcc --export-symbols -- libgcc static? - static toolchain support base system: diff --git a/mk/package.mk b/mk/package.mk index c23530e17..0025f802c 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -240,7 +240,7 @@ endif 'ramdisk location:' >&2; \ echo "$$$$x" | sed 's/^/- /' >&2; \ fi; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index bdc7104c3..88c0c590c 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -184,7 +184,7 @@ ifneq (,$(filter dev,${PKG_OPTS})) done endif @-cd ${WRKINST}; \ - if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" -a "${PKG_NAME}" != "tzdata" ];then \ + if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" -a "${PKG_NAME}" != "tzdata" ];then \ find lib \( -name lib\*.so\* -o -name lib\*.a \) \ -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ diff --git a/mk/vars.mk b/mk/vars.mk index ffb26fb18..537633139 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -93,6 +93,11 @@ TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib +# use -static-libgcc by default +TARGET_CFLAGS+= -static-libgcc +TARGET_CXXFLAGS+= -static-libgcc +TARGET_LDFLAGS+= -static-libgcc + # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf TARGET_LDFLAGS+= -Wl,-z,relro,-z,now # needed for musl ppc diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 3743944f1..d0b080624 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3 PKG_DESCR:= mixer/player utility PKG_SECTION:= multimedia -PKG_DEPENDS:= alsa-lib libpthread libgcc librt +PKG_DEPENDS:= alsa-lib libpthread librt PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/ diff --git a/package/busybox/Makefile b/package/busybox/Makefile index b62855399..486f26c89 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -35,9 +35,12 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \ - HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ - CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' \ +BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" \ + ARCH="${ARCH}" \ + GCC_HONOUR_COPTS=s \ + HOSTCC="${CC_FOR_BUILD}" \ + HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ -C ${WRKBUILD} do-configure: diff --git a/package/busybox/patches/014-disable-static-libgcc.patch b/package/busybox/patches/014-disable-static-libgcc.patch deleted file mode 100644 index 79d6345a7..000000000 --- a/package/busybox/patches/014-disable-static-libgcc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur busybox-1.20.2.orig/Makefile.flags busybox-1.20.2/Makefile.flags ---- busybox-1.20.2.orig/Makefile.flags 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/Makefile.flags 2013-08-13 14:25:53.000000000 +0200 -@@ -50,7 +50,7 @@ - # -fno-guess-branch-probability: prohibit pseudo-random guessing - # of branch probabilities (hopefully makes bloatcheck more stable): - CFLAGS += $(call cc-option,-fno-guess-branch-probability,) --CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,) -+CFLAGS += $(call cc-option,-funsigned-char,) - CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,) - - # FIXME: These warnings are at least partially to be concerned about and should diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 3d1d41410..6497eac03 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -27,7 +27,6 @@ $(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TARGET_LDFLAGS+= -static-libgcc do-install: ${INSTALL_DIR} ${IDIR_CFGFS}/sbin diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 1e0eaca25..0d53188af 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt PKG_DEPENDS+= kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc -PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm libgcc +PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ @@ -23,7 +23,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-selinux cryptsetup-install: diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 32fff503b..e3b19a0f3 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 726cd0b7a18c5e25f4d80ebeffe7607e PKG_DESCR:= small graphical web browser PKG_SECTION:= x11/apps PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo -PKG_DEPENDS+= libstdcxx libpthread libgcc libopenssl +PKG_DEPENDS+= libstdcxx libpthread libopenssl PKG_BUILDDEP:= fltk libXi libiconv-tiny libjpeg-turbo libpng zlib openssl PKG_URL:= http://www.dillo.org/ PKG_SITES:= http://www.dillo.org/download/ diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 58c55376d..c73d34a90 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -29,7 +29,6 @@ ifeq ($(ADK_STATIC),y) TARGET_LDFLAGS+= -static endif -TARGET_LDFLAGS+= -static-libgcc BUILD_STYLE:= manual INSTALL_STYLE:= manual CONFIGURE_ARGS+= --disable-pam \ diff --git a/package/file/Makefile b/package/file/Makefile index bc9c87a1c..398d4e4b0 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -7,10 +7,10 @@ PKG_NAME:= file PKG_VERSION:= 5.17 PKG_RELEASE:= 1 PKG_MD5SUM:= e19c47e069ced7b01ccb4db402cc01d3 -PKG_DESCR:= a file type guesser +PKG_DESCR:= file type guesser PKG_SECTION:= utils PKG_BUILDDEP:= file-host -PKG_DEPENDS:= libmagic libgcc +PKG_DEPENDS:= libmagic PKG_URL:= http://www.darwinsys.com/file PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ ftp://ftp.astron.com/pub/file/ diff --git a/package/firefox/Makefile b/package/firefox/Makefile index d54996401..c7124d632 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib glib libgtk libpng libtiff libxcursor libffi PKG_DEPENDS+= nspr nss libjpeg-turbo libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme -PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt libgcc +PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf librt 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 diff --git a/package/gcc/Makefile b/package/gcc/Makefile index e5dece2fc..b0d3194e8 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -8,7 +8,7 @@ PKG_NAME:= gcc PKG_DESCR:= GNU C compiler PKG_SECTION:= lang PKG_OPTS:= noremove -PKG_DEPENDS:= libmpc libgmp mpfr libgcc +PKG_DEPENDS:= libmpc libgmp mpfr PKG_BUILDDEP:= libmpc gmp mpfr PKG_SUBPKGS:= GCC GXX diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 4513346c4..0ee1da3d1 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -7,7 +7,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_NAME:= gdb PKG_DESCR:= programm debugger PKG_SECTION:= debug -PKG_DEPENDS:= libthread-db libncurses libexpat libgcc zlib +PKG_DEPENDS:= libthread-db libncurses libexpat zlib PKG_BUILDDEP:= ncurses readline libiconv-tiny expat zlib PKG_NOPARALLEL:= 1 diff --git a/package/git/Makefile b/package/git/Makefile index 1c23bffb8..3bdf0f1d4 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 6f63d103465b86ca0ebe4189ea54731c PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_BUILDDEP:= openssl curl expat autotool -PKG_DEPENDS:= libopenssl libcurl libexpat libpthread libgcc +PKG_DEPENDS:= libopenssl libcurl libexpat libpthread PKG_URL:= http://git-scm.com/ PKG_SITES:= http://git-core.googlecode.com/files/ diff --git a/package/iw/Makefile b/package/iw/Makefile index 75c4aa5b9..fc20c2f52 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= iw PKG_VERSION:= 3.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 17704d7c41bcb85cb32cb33b07a1c4cc -PKG_DESCR:= Tools for setting up WiFi cards via netlink (nl80211) +PKG_DESCR:= tools for setting up WiFi cards via netlink (nl80211) PKG_SECTION:= wifi -PKG_DEPENDS:= libnl libgcc +PKG_DEPENDS:= libnl PKG_BUILDDEP:= libnl PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw PKG_SITES:= http://wireless.kernel.org/download/iw/ diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile deleted file mode 100644 index 7743898fd..000000000 --- a/package/libgcc/Makefile +++ /dev/null @@ -1,33 +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 -include ${TOPDIR}/toolchain/gcc/Makefile.inc - -PKG_NAME:= libgcc -PKG_DESCR:= GCC library -PKG_SECTION:= libs - -NO_DISTFILES:= 1 - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBGCC,libgcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -do-install: - ${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) -ifeq ($(ADK_LINUX_SH),y) -ifeq ($(ADK_TARGET_LIB_GLIBC),y) - ${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) -else - ${CP} ${STAGING_TARGET_DIR}/lib/m4-nofpu/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) -endif -else - ${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) -endif - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 6b639ed0c..a479318f8 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c7ae774eab4cb7ac85e41b712f4ee9ba PKG_DESCR:= lightweight web server PKG_SECTION:= www -PKG_DEPENDS:= libgcc PKG_URL:= http://www.lighttpd.net/ PKG_SITES:= http://download.lighttpd.net/lighttpd/releases-1.4.x/ diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 76f15499e..3f56fa7c5 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -24,7 +24,6 @@ $(eval $(call HOST_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) TARGET_CPPFLAGS+= -DMKSH_SMALL=1 -TARGET_LDFLAGS+= -static-libgcc HOST_STYLE:= manual CONFIG_STYLE:= manual diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 0ba32ec2d..a494f5b90 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 046f23f63ad9aa4af38159754f813fc7 PKG_DESCR:= music player daemon PKG_SECTION:= multimedia -PKG_DEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient librt -PKG_FDEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient librt +PKG_DEPENDS:= glib libstdcxx libiconv-tiny libmpdclient librt +PKG_FDEPENDS:= glib libstdcxx libiconv-tiny libmpdclient librt PKG_BUILDDEP:= glib libmpdclient PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index 7e724dcd3..6c86babd9 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -11,7 +11,7 @@ PKG_MD5SUM:= 1c882539dfcbc4e8efeae85ff8069cbe PKG_DESCR:= video player for raspberry pi PKG_SECTION:= multimedia PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre -PKG_DEPENDS+= librt zlib libpthread libstdcxx libgcc libdbus +PKG_DEPENDS+= librt zlib libpthread libstdcxx libdbus PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus PKG_URL:= https://github.com/popcornmix/omxplayer PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 887e2bf68..41697c9c2 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -15,7 +15,7 @@ PKG_BUILDDEP+= libpng giflib gtk+ glib fontconfig nss HOST_BUILDDEP:= fastjar-host gcj-host ecj-host classpath-host jamvm-host HOST_BUILDDEP+= jikes-host ant-host libXtst-host libXt-host libXinerama-host HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host -PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc cups +PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi cups PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo PKG_DEPENDS+= libpng giflib libgtk glib fontconfig PKG_URL:= http://openjdk.org/ diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 4a5b6c924..94f9812f0 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 3e9800e6bca1fbac0eea4d41baa7f239 PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib openssl -PKG_DEPENDS:= zlib libopenssl libpthread libgcc +PKG_DEPENDS:= zlib libopenssl libpthread PKG_URL:= http://www.openssh.com/ PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 930f551c3..1bce40812 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 4 PKG_MD5SUM:= 00aec1287da2dfffda17a9b1c0a01868 PKG_DESCR:= system-wide profiles PKG_SECTION:= debug -PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx libgcc +PKG_DEPENDS:= libpopt kmod-oprofile libbfd libstdcxx PKG_BUILDDEP:= popt binutils gcc PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} diff --git a/package/parted/Makefile b/package/parted/Makefile index 63229e70b..fe86ba7dd 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 5d89d64d94bcfefa9ce8f59f4b81bdcb PKG_DESCR:= partition table editor PKG_SECTION:= fs -PKG_DEPENDS:= libblkid libuuid libreadline libpthread libgcc +PKG_DEPENDS:= libblkid libuuid libreadline libpthread PKG_BUILDDEP:= util-linux readline PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index ed1720a40..a085cd280 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 72ebc3624ccb43ae2ddf872b5dfdb3c9 PKG_DESCR:= PCI utilities PKG_SECTION:= utils -PKG_DEPENDS:= zlib libgcc +PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/ PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ diff --git a/package/php/Makefile b/package/php/Makefile index c2ee40888..ee29ed9a3 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 3fb091987063135fd86b3b5ba5010479 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang -PKG_DEPENDS:= libpthread librt libgcc +PKG_DEPENDS:= libpthread librt PHP_URL:= http://www.php.net/ PKG_SITES:= http://de.php.net/distributions/ diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index bf25b15d4..ddca9a233 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= sound system for POSIX OSes PKG_SECTION:= multimedia PKG_DEPENDS:= libltdl json-c libsndfile libspeex libncurses PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile -PKG_DEPENDS+= libgcc libpthread librt alsa-lib libsamplerate +PKG_DEPENDS+= libpthread librt alsa-lib libsamplerate PKG_BUILDDEP:= libtool json-c libsndfile speex libsamplerate PKG_BUILDDEP+= flac libvorbis libogg util-linux ncurses alsa-lib PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ diff --git a/package/python2/Makefile b/package/python2/Makefile index 757e6adc5..0aeb0cf08 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -7,11 +7,11 @@ PKG_NAME:= python2 PKG_VERSION:= 2.7.5 PKG_RELEASE:= 12 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df -PKG_DESCR:= Python scripting language (Version 2) +PKG_DESCR:= python scripting language (Version 2) PKG_SECTION:= lang PKG_BUILDDEP:= libffi python2-host HOST_BUILDDEP:= libffi-host bzip2-host autotool -PKG_DEPENDS:= libpthread libffi libgcc +PKG_DEPENDS:= libpthread libffi PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ PKG_OPTS:= dev diff --git a/package/python3/Makefile b/package/python3/Makefile index e939a9155..3b01a5eb7 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= python3 PKG_VERSION:= 3.4.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 77c22725e14af3d71022cbfdebff4903 -PKG_DESCR:= Python scripting language (Version 3) +PKG_DESCR:= python scripting language (Version 3) PKG_SECTION:= lang -PKG_DEPENDS:= libpthread libgcc libffi +PKG_DEPENDS:= libpthread libffi PKG_BUILDDEP:= python3-host libffi HOST_BUILDDEP:= libffi-host PKG_URL:= http://www.python.org/ diff --git a/package/qingy/Makefile b/package/qingy/Makefile index 4e095f2b2..560c091c2 100644 --- a/package/qingy/Makefile +++ b/package/qingy/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= qingy PKG_VERSION:= 1.0.0 PKG_RELEASE:= 3 PKG_MD5SUM:= 1e0912655e240adfd0ce5ced30bbc685 -PKG_DESCR:= a DirectFB getty replacement +PKG_DESCR:= directfb getty replacement PKG_SECTION:= misc -PKG_DEPENDS:= directfb libncurses libgcc librt libpthread +PKG_DEPENDS:= directfb libncurses librt libpthread PKG_DEPENDS+= libstdcxx PKG_BUILDDEP:= DirectFB ncurses PKG_URL:= http://qingy.sourceforge.net/ diff --git a/package/ruby/Makefile b/package/ruby/Makefile index d43c770b2..b3557d809 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e57fdbb8ed56e70c43f39c79da1654b2 PKG_DESCR:= interpreter for the ruby language PKG_SECTION:= lang -PKG_DEPENDS:= librt libpthread libgcc +PKG_DEPENDS:= librt libpthread PKG_BUILDDEP:= ruby-host HOST_BUILDDEP:= readline-host PKG_URL:= http://www.ruby-lang.org/ diff --git a/package/strace/Makefile b/package/strace/Makefile index 7a4c11a9d..fac6fc3f2 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 8 PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575 PKG_DESCR:= system call trace program PKG_SECTION:= debug -PKG_DEPENDS:= libgcc PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} include ${TOPDIR}/mk/package.mk diff --git a/package/tar/Makefile b/package/tar/Makefile index 0d1ee9255..f227047cc 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 0ced6f20b9fa1bea588005b5ad4b52c1 PKG_DESCR:= archiving application PKG_SECTION:= archive -PKG_DEPENDS:= libgcc PKG_URL:= http://mirrors.kernel.org/gnu/tar/ PKG_SITES:= http://mirrors.kernel.org/gnu/tar/ diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index e566af870..bcadb9182 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c9aa14ee3d6c991fda183f42cf72a8a8 PKG_DESCR:= program to list USB devices PKG_SECTION:= utils -PKG_DEPENDS:= libusb libusb-compat libpthread zlib librt libgcc +PKG_DEPENDS:= libusb libusb-compat libpthread zlib librt PKG_BUILDDEP:= libusb libusb-compat zlib PKG_SITES:= http://www.kernel.org/pub/linux/utils/usb/usbutils/ diff --git a/package/vim/Makefile b/package/vim/Makefile index cd09b8c2f..1a8f2e52c 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 607e135c559be642f210094ad023dc65 PKG_DESCR:= The text editor PKG_SECTION:= editor -PKG_DEPENDS:= libncurses libgcc +PKG_DEPENDS:= libncurses PKG_BUILDDEP:= ncurses PKG_URL:= http://www.vim.org/ PKG_SITES:= ftp://ftp.vim.org/pub/vim/unix/ diff --git a/package/xauth/Makefile b/package/xauth/Makefile index 132b6236c..a45db0e33 100644 --- a/package/xauth/Makefile +++ b/package/xauth/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 63c5fe6f8459ac08088958febc1db122 PKG_DESCR:= X authority file utility PKG_SECTION:= x11/apps -PKG_DEPENDS:= libx11 libxext libxmu libgcc +PKG_DEPENDS:= libx11 libxext libxmu PKG_BUILDDEP:= libX11 libXext libXmu PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 35060b06a..fa9cea06e 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -10,8 +10,7 @@ PKG_MD5SUM:= de9f1f45026c2f4e0776058d429ff4b6 PKG_DESCR:= utilities for XFS filesystems PKG_SECTION:= fs PKG_BUILDDEP:= e2fsprogs util-linux ncurses -PKG_DEPENDS:= libuuid libpthread libblkid librt libgcc -PKG_DEPENDS+= libncurses +PKG_DEPENDS:= libuuid libpthread libblkid librt libncurses PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 486bcec2e..473b9e93d 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= x11/server PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext -PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libgcc librt +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb librt PKG_DEPENDS+= libxshmfence libfreetype libfontenc PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto |