Merge pull request #125 from plexinc/upstream-pr

introduce some prerequisited to build qt5

packages/compress/bzip2/package.mk

@@ -23,6 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bzip.org"
 PKG_URL="http://www.bzip.org/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST="toolchain"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="compress"
@@ -32,7 +33,27 @@ PKG_LONGDESC="bzip2 is a freely available, patent free (see below), high-quality
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+pre_build_host() {
+  mkdir -p $ROOT/$PKG_BUILD/.$HOST_NAME
+  cp -r $ROOT/$PKG_BUILD/* $ROOT/$PKG_BUILD/.$HOST_NAME
+}
+
+make_host() {
+  cd $ROOT/$PKG_BUILD/.$HOST_NAME
+  make -f Makefile-libbz2_so CC=$HOST_CC CFLAGS="$CFLAGS -fPIC -DPIC"
+}
+
+makeinstall_host() {
+  make install PREFIX=$ROOT/$TOOLCHAIN
+}
+
+pre_build_target() {
+  mkdir -p $ROOT/$PKG_BUILD/.$TARGET_NAME
+  cp -r $ROOT/$PKG_BUILD/* $ROOT/$PKG_BUILD/.$TARGET_NAME
+}
+
 pre_make_target() {
+  cd $ROOT/$PKG_BUILD/.$TARGET_NAME
   sed -e "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$PKG_VERSION libbz2.so,g" -i Makefile-libbz2_so
 }
 

packages/devel/cmake/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.cmake.org/"
 PKG_URL="http://www.cmake.org/files/v3.5/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host"
+PKG_DEPENDS_HOST="ccache:host libressl:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="cmake: A cross-platform, open-source make system"
@@ -39,6 +39,7 @@ configure_host() {
                -DCMAKE_C_FLAGS="-O2 -Wall -pipe -Wno-format-security" \
                -DCMAKE_CXX_FLAGS="-O2 -Wall -pipe -Wno-format-security" \
                -DCMAKE_EXE_LINKER_FLAGS="$HOST_LDFLAGS" \
+               -DCMAKE_USE_OPENSSL=ON \
                -DBUILD_CursesDialog=0
 }
 

packages/devel/flex/patches/flex-001-plex.malloc.patch

@@ -0,0 +1,15 @@
+--- a/configure.ac	2015-02-10 15:21:25.466408144 +0100
++++ b/configure.ac.new	2015-02-10 15:21:08.070408144 +0100
+@@ -106,9 +106,9 @@
+ 
+ AC_FUNC_ALLOCA
+ AC_FUNC_FORK
+-AC_FUNC_MALLOC
+-AC_FUNC_REALLOC
+-AC_CHECK_FUNCS([dup2 isascii memset pow regcomp setlocale strchr strtol])
++# AC_FUNC_MALLOC
++# AC_FUNC_REALLOC
++AC_CHECK_FUNCS([malloc realloc dup2 isascii memset pow regcomp setlocale strchr strtol])
+ 
+ AC_CONFIG_FILES(
+ Makefile

packages/devel/libcec/package.mk

@@ -71,5 +71,7 @@ configure_target() {
 }
 
 post_makeinstall_target() {
-  mv $INSTALL/usr/lib/python2.7/dist-packages $INSTALL/usr/lib/python2.7/site-packages
+  if [ -d $INSTALL/usr/lib/python2.7/dist-packages ]; then 
+    mv $INSTALL/usr/lib/python2.7/dist-packages $INSTALL/usr/lib/python2.7/site-packages
+  fi
 }

packages/lang/Python/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.python.org/"
 PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_HOST="zlib:host"
+PKG_DEPENDS_HOST="zlib:host bzip2:host"
 PKG_DEPENDS_TARGET="toolchain sqlite expat zlib bzip2 libressl libffi Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"