Mercurial > vanilla

changeset 602:705beca72ba0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: fix many meson based builds
author David Demelier <markand@malikania.fr>
date Sat, 13 Jul 2019 18:04:46 +0200
parents 70fbd54ba952
children 72f357a69221
files accessibility/at-spi2-core/at-spi2-core.sh graphics/gdk-pixbuf/gdk-pixbuf.sh graphics/gtk2/gtk2.sh graphics/libepoxy/libepoxy.sh graphics/mesa/mesa.sh lib/glib/glib.sh lib/libinput/libinput.sh
diffstat 7 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/accessibility/at-spi2-core/at-spi2-core.sh	Sat Jul 13 22:44:11 2019 +0200
+++ b/accessibility/at-spi2-core/at-spi2-core.sh	Sat Jul 13 18:04:46 2019 +0200
@@ -55,6 +55,7 @@
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
+		-D libdir=lib \
 		. build
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
--- a/graphics/gdk-pixbuf/gdk-pixbuf.sh	Sat Jul 13 22:44:11 2019 +0200
+++ b/graphics/gdk-pixbuf/gdk-pixbuf.sh	Sat Jul 13 18:04:46 2019 +0200
@@ -86,6 +86,7 @@
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
+		-D libdir=lib \
 		-D docs=false \
 		-D man=false \
 		$with_jasper \
--- a/graphics/gtk2/gtk2.sh	Sat Jul 13 22:44:11 2019 +0200
+++ b/graphics/gtk2/gtk2.sh	Sat Jul 13 18:04:46 2019 +0200
@@ -61,8 +61,8 @@
 
 build()
 {
-	rm -rf gtk+-$PKGVERSION
-	tar xvaf gtk+-$PKGVERSION.tar.xz
+	#rm -rf gtk+-$PKGVERSION
+	#tar xvaf gtk+-$PKGVERSION.tar.xz
 	pushd gtk+-$PKGVERSION
 
 	CC="$CC" \
@@ -74,6 +74,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
+		--localedir=/share/locale \
 		$with_cups \
 		$with_nls
 	make
@@ -87,6 +88,6 @@
 	rm -f $DESTDIR/lib/lib{gdk,gtk}-x11-2.0.la
 
 	popd
-	rm -rf gtk+-$PKGVERSION
+	#rm -rf gtk+-$PKGVERSION
 }
 
--- a/graphics/libepoxy/libepoxy.sh	Sat Jul 13 22:44:11 2019 +0200
+++ b/graphics/libepoxy/libepoxy.sh	Sat Jul 13 18:04:46 2019 +0200
@@ -53,6 +53,8 @@
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
+		-D libdir=lib \
+		-D tests=false \
 		$with_x \
 		. build
 	ninja -C build
--- a/graphics/mesa/mesa.sh	Sat Jul 13 22:44:11 2019 +0200
+++ b/graphics/mesa/mesa.sh	Sat Jul 13 18:04:46 2019 +0200
@@ -66,8 +66,8 @@
 
 build()
 {
-	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+	#rm -rf $PKGNAME-$PKGVERSION
+	#tar xvaf $PKGNAME-$PKGVERSION.tar.xz
 	pushd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../disable-tls.patch
@@ -82,6 +82,7 @@
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
+		-D libdir=lib \
 		-D egl=true \
 		-D bpm=true \
 		-D platforms=$with_platforms \
@@ -95,6 +96,6 @@
 	DESTDIR=$DESTDIR ninja -C build install
 
 	popd
-	rm -rf $PKGNAME-$PKGVERSION
+	#rm -rf $PKGNAME-$PKGVERSION
 }
 
--- a/lib/glib/glib.sh	Sat Jul 13 22:44:11 2019 +0200
+++ b/lib/glib/glib.sh	Sat Jul 13 18:04:46 2019 +0200
@@ -55,6 +55,7 @@
 		--prefix / \
 		--buildtype release \
 		--default-library shared \
+		-D libdir=lib \
 		$with_nls \
 		$with_selinux \
 		. build
--- a/lib/libinput/libinput.sh	Sat Jul 13 22:44:11 2019 +0200
+++ b/lib/libinput/libinput.sh	Sat Jul 13 18:04:46 2019 +0200
@@ -60,6 +60,7 @@
 		--default-library shared \
 		-D debug-gui=false \
 		-D tests=false \
+		-D libdir=lib \
 		$with_doxygen \
 		$with_wacom \
 		. build