From 31fe01b50325cbde689899d5f6ce7d859ae03f07 Mon Sep 17 00:00:00 2001 From: Pim Vullers Date: Wed, 5 Feb 2014 14:34:06 +0100 Subject: [PATCH 1/5] Disable tracing support for dtrace and systemtap in host build --- packages/devel/glib/package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index 7cff2ab1fe..9fd74f2a0b 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -37,6 +37,8 @@ PKG_CONFIGURE_OPTS_HOST="--with-gnu-ld \ --with-libiconv=no \ --enable-debug=no \ --disable-man \ + --disable-dtrace \ + --disable-systemtap \ --disable-rebuilds \ --disable-gtk-doc" From 4fb5978256be8e7819f0afef085aecb1c7e3cc62 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 5 Feb 2014 14:50:24 +0200 Subject: [PATCH 2/5] util-linux:host: build static --- packages/sysutils/util-linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 890b526671..1d9271a80a 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -95,7 +95,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-gtk-doc \ --without-utempter \ --without-systemdsystemunitdir" -PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET" +PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET --enable-static --disable-shared" post_makeinstall_target() { rm -rf $INSTALL/usr/bin From e158fa00796c0af548aaa2baf6e4b570f62cad41 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 5 Feb 2014 14:50:40 +0200 Subject: [PATCH 3/5] parted:host: build static --- packages/sysutils/parted/package.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/parted/package.mk b/packages/sysutils/parted/package.mk index f14befe8de..ee0e6c4061 100644 --- a/packages/sysutils/parted/package.mk +++ b/packages/sysutils/parted/package.mk @@ -33,15 +33,19 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" -PKG_CONFIGURE_OPTS_HOST="--disable-shared --without-readline" +PKG_CONFIGURE_OPTS_HOST="--disable-device-mapper \ + --enable-static \ + --disable-shared \ + --without-readline \ + --disable-rpath \ + --with-gnu-ld" + PKG_CONFIGURE_OPTS_TARGET="--disable-device-mapper \ --disable-shared \ --without-readline \ --disable-rpath \ --with-gnu-ld" -PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET" - post_make_target() { # dont build parallel MAKEFLAGS=-j1 From 8bee51d51dd3d94efd73ad7816735019e0de736f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 5 Feb 2014 19:07:25 +0200 Subject: [PATCH 4/5] xbmc: drop ENCODER_VORBIS. make xbmc always depend on libvorbis I dont think ENCODER_VORBIS=no ever worked as vorbis is a xbmc hard requirment since 2009 later --enable-libvorbisenc may be removed if not needed, and vorbis compiled static closes #2918 --- packages/mediacenter/xbmc/package.mk | 11 ++--------- projects/ATV/options | 3 --- projects/Cuboxi/options | 3 --- projects/Generic/options | 3 --- projects/RPi/options | 3 --- projects/Virtual/options | 3 --- 6 files changed, 2 insertions(+), 24 deletions(-) diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 22e80468e9..22f87279ed 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite" +PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite libvorbis" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" @@ -178,13 +178,6 @@ else XBMC_LAMEENC="--disable-libmp3lame" fi -if [ "$ENCODER_VORBIS" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvorbis" - XBMC_VORBISENC="--enable-libvorbisenc" -else - XBMC_VORBISENC="--disable-libvorbisenc" -fi - if [ "$BLURAY_SUPPORT" = yes ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbluray" XBMC_BLURAY="--enable-libbluray" @@ -349,7 +342,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \ $XBMC_SAMBA \ $XBMC_NFS \ $XBMC_AFP \ - $XBMC_VORBISENC \ + --enable-libvorbisenc \ --disable-libcap \ --enable-ffmpeg-libvorbis \ $XBMC_LAMEENC \ diff --git a/projects/ATV/options b/projects/ATV/options index d09909ca94..5aa6909067 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -157,9 +157,6 @@ # build and install with LAME cdrip encoder support ENCODER_LAME="yes" -# build and install with VORBIS cdrip encoder support - ENCODER_VORBIS="yes" - # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options index 805b984f6d..5610f351bd 100644 --- a/projects/Cuboxi/options +++ b/projects/Cuboxi/options @@ -158,9 +158,6 @@ # build and install with LAME cdrip encoder support ENCODER_LAME="yes" -# build and install with VORBIS cdrip encoder support - ENCODER_VORBIS="yes" - # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 7d4263968e..219dbfd1ae 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -157,9 +157,6 @@ # build and install with LAME cdrip encoder support ENCODER_LAME="yes" -# build and install with VORBIS cdrip encoder support - ENCODER_VORBIS="yes" - # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 2b53194be1..fdc6d0a04c 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -158,9 +158,6 @@ # build and install with LAME cdrip encoder support ENCODER_LAME="yes" -# build and install with VORBIS cdrip encoder support - ENCODER_VORBIS="yes" - # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" diff --git a/projects/Virtual/options b/projects/Virtual/options index 6f27c36f89..9d2b5d7167 100644 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -152,9 +152,6 @@ # build and install with LAME cdrip encoder support ENCODER_LAME="yes" -# build and install with VORBIS cdrip encoder support - ENCODER_VORBIS="yes" - # build and install with BluRay support (yes / no) BLURAY_SUPPORT="yes" From d22c2dbb1b66b73c0cbf9241c32b53baeb0a52a6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 5 Feb 2014 19:23:05 +0200 Subject: [PATCH 5/5] libvorbis: disable oggtest, docs, examples --- packages/audio/libvorbis/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/audio/libvorbis/package.mk b/packages/audio/libvorbis/package.mk index 27bfa918ff..721d0129e0 100644 --- a/packages/audio/libvorbis/package.mk +++ b/packages/audio/libvorbis/package.mk @@ -33,4 +33,4 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="yes" # package specific configure options -PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr" +PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr --disable-oggtest --disable-docs --disable-examples"