From 3f619059ba42ade7413bd60faff37becda78ed28 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 21 Oct 2019 13:42:59 -0700 Subject: [PATCH 1/2] fribidi: switch to use meson --- packages/devel/fribidi/package.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk index 737ae29db7..ae062eae02 100644 --- a/packages/devel/fribidi/package.mk +++ b/packages/devel/fribidi/package.mk @@ -10,15 +10,12 @@ PKG_SITE="http://fribidi.freedesktop.org/" PKG_URL="https://github.com/fribidi/fribidi/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A bidirectional algorithm library." -PKG_TOOLCHAIN="configure" +PKG_TOOLCHAIN="meson" PKG_BUILD_FLAGS="+pic" -PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ - --enable-static \ - --disable-debug \ - --disable-deprecated \ - --disable-silent-rules \ - --with-gnu-ld" +PKG_MESON_OPTS_TARGET="-Ddeprecated=false \ + -Ddocs=false \ + -Ddefault_library=static" pre_configure_target() { export CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080" From 7f08fc23e5db8d6e8fc4bb03ac3307fea188a3c0 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 21 Oct 2019 13:45:14 -0700 Subject: [PATCH 2/2] fribidi: as of upstream commit c8e9c5d FRIBIDI_CHUNKSIZE doesn't exist anymore --- packages/devel/fribidi/package.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk index ae062eae02..a00a1f2b44 100644 --- a/packages/devel/fribidi/package.mk +++ b/packages/devel/fribidi/package.mk @@ -17,10 +17,6 @@ PKG_MESON_OPTS_TARGET="-Ddeprecated=false \ -Ddocs=false \ -Ddefault_library=static" -pre_configure_target() { - export CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080" -} - post_makeinstall_target() { mkdir -p $SYSROOT_PREFIX/usr/bin cp -f $PKG_DIR/scripts/fribidi-config $SYSROOT_PREFIX/usr/bin