Merge pull request #6224 from heitbaum/package_updates

Minor package updates and tidy ups

packages/graphics/glu/package.mk

@@ -11,9 +11,5 @@ PKG_URL="https://mesa.freedesktop.org/archive/glu/glu-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain mesa"
 PKG_NEED_UNPACK="$(get_pkg_directory mesa)"
 PKG_LONGDESC="libglu is the The OpenGL utility library"
-PKG_TOOLCHAIN="autotools"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
-                           --disable-debug \
-                           --disable-osmesa \
-                           --with-gnu-ld"
+PKG_MESON_OPTS_TARGET="-Dgl_provider=gl"

packages/textproc/libxml2/package.mk

@@ -13,17 +13,20 @@ PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files."
 
 PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \
-             --enable-static \
-             --enable-shared \
-             --disable-silent-rules \
-             --enable-ipv6 \
-             --without-python \
-             --with-zlib=${TOOLCHAIN} \
-             --without-lzma"
+                        --enable-static \
+                        --enable-shared \
+                        --disable-silent-rules \
+                        --enable-ipv6 \
+                        --without-lzma"
 
-PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_ALL} --with-zlib=${TOOLCHAIN} --with-python"
+PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_ALL} \
+                         --with-zlib=${TOOLCHAIN} \
+                         --with-python"
 
-PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_ALL} --with-zlib=${SYSROOT_PREFIX}/usr --with-sysroot=${SYSROOT_PREFIX}"
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_ALL} \
+                           --with-zlib=${SYSROOT_PREFIX}/usr \
+                           --without-python \
+                           --with-sysroot=${SYSROOT_PREFIX}"
 
 post_makeinstall_target() {
   sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xml2-config