From dc42ff9882094def56c68cf39bce294d3a1d3aab Mon Sep 17 00:00:00 2001 From: sulincix Date: Mon, 23 Sep 2024 19:25:41 +0000 Subject: [PATCH] fixes --- dev/libs/glib/ympbuild | 1 - dev/libs/gobject-introspection/ympbuild | 10 ++++++---- dev/python/graphviz/ympbuild | 2 ++ dev/util/vulkan-headers/ympbuild | 6 +++--- sys/devel/automake/ympbuild | 8 ++++++-- sys/libs/gdbm/ympbuild | 1 + 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dev/libs/glib/ympbuild b/dev/libs/glib/ympbuild index 5f144826..79ceb489 100644 --- a/dev/libs/glib/ympbuild +++ b/dev/libs/glib/ympbuild @@ -23,7 +23,6 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ --libdir=/usr/lib64 \ - --default-library both \ -D glib_debug=disabled \ -D selinux=disabled \ -D sysprof=disabled diff --git a/dev/libs/gobject-introspection/ympbuild b/dev/libs/gobject-introspection/ympbuild index 6316b666..675fbbf7 100644 --- a/dev/libs/gobject-introspection/ympbuild +++ b/dev/libs/gobject-introspection/ympbuild @@ -8,7 +8,7 @@ email='bayramk@gmail.com' maintainer='bk' license=('GPLv3') source=("https://gitlab.gnome.org/GNOME/gobject-introspection/-/archive/${version}/gobject-introspection-${version}.tar.gz") -depends=() +depends=(glib) makedepends=() sha256sums=('82c2372520d9ec58f0361efddb2ef9ce4026618b7389e99ba73f8a4e683ed361') group=(dev.libs) @@ -17,11 +17,13 @@ arch=('x86_64') cd $name-$version +prepare(){ + sed -i "s|subdir('tests')||g" meson.build +} + setup(){ - unset meson meson setup build --prefix=/usr \ - --libdir=/usr/lib64/ \ - --wrap-mode=nodownload + --libdir=/usr/lib64/ } build(){ diff --git a/dev/python/graphviz/ympbuild b/dev/python/graphviz/ympbuild index 075fe275..9787d3db 100644 --- a/dev/python/graphviz/ympbuild +++ b/dev/python/graphviz/ympbuild @@ -18,6 +18,8 @@ arch=('x86_64') cd $name-$version setup () { + touch redhat/graphviz.spec.rhel.in + autoreconf -fvi ./configure --prefix=/usr \ --libdir=/usr/lib64/ \ --sysconfdir=/etc \ diff --git a/dev/util/vulkan-headers/ympbuild b/dev/util/vulkan-headers/ympbuild index 04377fb6..a9d6b5c5 100755 --- a/dev/util/vulkan-headers/ympbuild +++ b/dev/util/vulkan-headers/ympbuild @@ -19,15 +19,15 @@ cd Vulkan-Headers-$version setup(){ mkdir build && cd build - cmake .. \ + cmake -G Ninja .. \ -DCMAKE_INSTALL_PREFIX=/usr } build(){ - make -C build $jobs + ninja -C build $jobs } package(){ - make -C build install $jobs + ninja -C build install $jobs } diff --git a/sys/devel/automake/ympbuild b/sys/devel/automake/ympbuild index c501035b..9aebe166 100755 --- a/sys/devel/automake/ympbuild +++ b/sys/devel/automake/ympbuild @@ -17,9 +17,13 @@ arch=('x86_64') cd $name-$version +prepare(){ + ./bootstrap +} + setup(){ - ./configure --prefix=/usr \ - --libdir=/usr/lib64 + autoreconf -fvi + ./configure --prefix=/usr } build(){ diff --git a/sys/libs/gdbm/ympbuild b/sys/libs/gdbm/ympbuild index feafda05..4fcbee40 100755 --- a/sys/libs/gdbm/ympbuild +++ b/sys/libs/gdbm/ympbuild @@ -18,6 +18,7 @@ arch=('x86_64') cd $name-$version setup(){ + autoreconf -fvi ./configure --prefix=/usr \ --libdir=/usr/lib64 \ --enable-libgdbm-compat