# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1568634786 -7200
# Node ID 9e8ac37514e68f2f5c03da8858ab4235520a1881
# Parent  68d397064a6bdbeff61b0492cec276ae1e1e419e
vanilla: fix many packages

diff -r 68d397064a6b -r 9e8ac37514e6 Scripts/bulk.sh
--- a/Scripts/bulk.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/Scripts/bulk.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -53,7 +53,6 @@
 	echo -n "building $name: "
 
 	if [ $force -eq 1 ] || ! vpk info $name > /dev/null 2>&1; then
-
 		cd $TOP/$pkg
 
 		if vpk build > $TMPDIR/fail.$name 2>&1; then
diff -r 68d397064a6b -r 9e8ac37514e6 audio/opus/opus.sh
--- a/audio/opus/opus.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/audio/opus/opus.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -35,6 +35,7 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
+	# --enable-custom-modes: needed for jack2.
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
@@ -43,7 +44,8 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared
+		--enable-shared \
+		--enable-custom-modes
 	make
 	make install DESTDIR=$DESTDIR
 	find $DESTDIR -type f -name "*.la" -delete
diff -r 68d397064a6b -r 9e8ac37514e6 audio/pulseaudio/pulseaudio.sh
--- a/audio/pulseaudio/pulseaudio.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/audio/pulseaudio/pulseaudio.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -172,6 +172,7 @@
 	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
+	CPP="$CC -E" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
diff -r 68d397064a6b -r 9e8ac37514e6 audio/wavpack/wavpack.sh
--- a/audio/wavpack/wavpack.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/audio/wavpack/wavpack.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -35,7 +35,7 @@
 	tar xvf $PKGVERSION.tar.gz
 	cd WavPack-$PKGVERSION
 
-	./autogen.sh
+	autoreconf -vif
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
diff -r 68d397064a6b -r 9e8ac37514e6 compression/bzip2/bzip2.sh
--- a/compression/bzip2/bzip2.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/compression/bzip2/bzip2.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -38,6 +38,7 @@
 	patch -p1 < ../patch-CVE-2016-3189.patch
 	patch -p0 < ../patch-fhs.patch
 	sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile
+	make CC="$CC" CFLAGS="$CFLAGS" all
 	make CC="$CC" CFLAGS="$CFLAGS" -f Makefile-libbz2_so all
 	make install DESTDIR=$DESTDIR PREFIX=/
 	install -D libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.$PKGVERSION
diff -r 68d397064a6b -r 9e8ac37514e6 compression/libzip/libzip.sh
--- a/compression/libzip/libzip.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/compression/libzip/libzip.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -39,6 +39,7 @@
 	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
+		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DCMAKE_EXE_LINKER_FLAGS="-lfts" \
 		-DCMAKE_INSTALL_LIBDIR=/lib \
diff -r 68d397064a6b -r 9e8ac37514e6 core/e2fsprogs/e2fsprogs.sh
--- a/core/e2fsprogs/e2fsprogs.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/core/e2fsprogs/e2fsprogs.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -69,7 +69,7 @@
 		--disable-libblkid \
 		--enable-elf-shlibs \
 		--with-crond-dir=/etc/cron.d \
-		$with_fuse
+		$with_fuse \
 		$with_nls
 	make
 	make install install-libs DESTDIR=$DESTDIR
diff -r 68d397064a6b -r 9e8ac37514e6 core/eudev/eudev.sh
--- a/core/eudev/eudev.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/core/eudev/eudev.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -31,6 +31,8 @@
 : ${CBUILD:=$(uname -m)-linux-musl}
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
+: ${CXX:=clang++}
+: ${CXXFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
 : ${KMOD:=yes}
@@ -51,6 +53,8 @@
 	autoreconf -fi
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
+	CXX="$CXX" \
+	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
 	./configure \
diff -r 68d397064a6b -r 9e8ac37514e6 python/py-mako/py-mako.sh
--- a/python/py-mako/py-mako.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/python/py-mako/py-mako.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -29,7 +29,12 @@
 	tar xvf Mako-$PKGVERSION.tar.gz
 	cd Mako-$PKGVERSION
 
-	python setup.py install --root=$DESTDIR --prefix=/.
+	python setup.py build
+	python setup.py install \
+		--root=$DESTDIR \
+		--prefix=/ \
+		--install-purelib=/lib/python3.7/site-packages \
+		--install-platlib=/lib/python3.7/lib-dynload
 
 	cd ..
 	rm -rf Mako-$PKGVERSION
diff -r 68d397064a6b -r 9e8ac37514e6 python/py-markupsafe/py-markupsafe.sh
--- a/python/py-markupsafe/py-markupsafe.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/python/py-markupsafe/py-markupsafe.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -30,7 +30,11 @@
 	cd MarkupSafe-$PKGVERSION
 
 	python setup.py build
-	python setup.py install --root=$DESTDIR --prefix=/.
+	python setup.py install \
+		--root=$DESTDIR \
+		--prefix=/ \
+		--install-purelib=/lib/python3.7/site-packages \
+		--install-platlib=/lib/python3.7/lib-dynload
 
 	cd ..
 	rm -rf MarkupSafe-$PKGVERSION
diff -r 68d397064a6b -r 9e8ac37514e6 python/py-setuptools/py-setuptools.sh
--- a/python/py-setuptools/py-setuptools.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/python/py-setuptools/py-setuptools.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -30,8 +30,21 @@
 		tar xvf v$PKGVERSION.tar.gz
 		cd setuptools-$PKGVERSION
 
+		case $py in
+		"python")
+			directory="3.7"
+			;;
+		"python2")
+			directory="2.7"
+			;;
+		esac
+
 		$py bootstrap.py
-		$py setup.py install --root=$DESTDIR --prefix=/.
+		$py setup.py install \
+			--root=$DESTDIR \
+			--prefix=/ \
+			--install-purelib=/lib/python$directory/site-packages \
+			--install-platlib=/lib/python$directory/lib-dynload
 
 		cd ..
 		rm -rf setuptools-$PKGVERSION
diff -r 68d397064a6b -r 9e8ac37514e6 python/python/python.sh
--- a/python/python/python.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/python/python/python.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -53,7 +53,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--target=$CTARGET \
-		--prefix=/. \
+		--prefix=/ \
 		--enable-shared \
 		--with-system-expat \
 		--with-system-ffi \
@@ -62,6 +62,7 @@
 	make
 	make install DESTDIR=$DESTDIR
 	ln -sf python3.7 $DESTDIR/bin/python
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf Python-$PKGVERSION
diff -r 68d397064a6b -r 9e8ac37514e6 ruby/ruby/ruby.sh
--- a/ruby/ruby/ruby.sh	Fri Sep 13 13:52:29 2019 +0200
+++ b/ruby/ruby/ruby.sh	Mon Sep 16 13:53:06 2019 +0200
@@ -38,6 +38,7 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
+	patch -p0 < ../patch-clang.patch
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	CXX="$CXX" \