# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1565201100 -7200
# Node ID 59a2fa6992bca6daaf0e1fad1c0dc10930e09858
# Parent  beb99c8029793d3427856c2cc9aded7fcdbcabf7
vanilla: re-enable static libraries

diff -r beb99c802979 -r 59a2fa6992bc audio/cdparanoia/cdparanoia.sh
--- a/audio/cdparanoia/cdparanoia.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/cdparanoia/cdparanoia.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 	./configure --prefix=
 	make
 	make install prefix=$DESTDIR MANDIR=$DESTDIR/share/man
-	rm -f $DESTDIR/lib/libcdda_*.a
 
 	cd ..
 	rm -rf $PKGNAME-III-$PKGVERSION
diff -r beb99c802979 -r 59a2fa6992bc audio/faac/faac.sh
--- a/audio/faac/faac.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/faac/faac.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -47,7 +47,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc audio/faad2/faad2.sh
--- a/audio/faad2/faad2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/faad2/faad2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -47,7 +47,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc audio/lame/lame.sh
--- a/audio/lame/lame.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/lame/lame.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--disable-static \
 		--enable-shared \
 		--prefix=
 	make
diff -r beb99c802979 -r 59a2fa6992bc audio/libcddb/libcddb.sh
--- a/audio/libcddb/libcddb.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/libcddb/libcddb.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -39,8 +39,7 @@
 	LIBS="$LIBS" \
 	./configure \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libcddb.la
diff -r beb99c802979 -r 59a2fa6992bc audio/libogg/libogg.sh
--- a/audio/libogg/libogg.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/libogg/libogg.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,8 +43,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libogg.la
diff -r beb99c802979 -r 59a2fa6992bc audio/libsndfile/libsndfile.sh
--- a/audio/libsndfile/libsndfile.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/libsndfile/libsndfile.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_alsa
 	make
diff -r beb99c802979 -r 59a2fa6992bc audio/libvorbis/libvorbis.sh
--- a/audio/libvorbis/libvorbis.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/libvorbis/libvorbis.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--disable-static \
 		--enable-shared \
 		--prefix=
 	make
diff -r beb99c802979 -r 59a2fa6992bc audio/opus/opus.sh
--- a/audio/opus/opus.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/opus/opus.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc audio/speex/speex.sh
--- a/audio/speex/speex.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/audio/speex/speex.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc compression/bzip2/bzip2.sh
--- a/compression/bzip2/bzip2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/compression/bzip2/bzip2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so
 	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%.*}
 	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%%.*}
-	rm -f $DESTDIR/lib/libbz2.a
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
diff -r beb99c802979 -r 59a2fa6992bc compression/libarchive/libarchive.sh
--- a/compression/libarchive/libarchive.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/compression/libarchive/libarchive.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -120,7 +120,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--enable-bsdtar=shared \
 		--enable-bsdcat=shared \
diff -r beb99c802979 -r 59a2fa6992bc compression/lz4/lz4.sh
--- a/compression/lz4/lz4.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/compression/lz4/lz4.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -31,8 +31,8 @@
 	tar xvf v$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
-	make CC="$CC" CFLAGS="$CFLAGS" BUILD_STATIC=no PREFIX=/
-	make BUILD_STATIC=no DESTDIR=$DESTDIR PREFIX=/ install
+	make CC="$CC" CFLAGS="$CFLAGS" PREFIX=/
+	make DESTDIR=$DESTDIR PREFIX=/ install
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
diff -r beb99c802979 -r 59a2fa6992bc compression/xz/xz.sh
--- a/compression/xz/xz.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/compression/xz/xz.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -52,7 +52,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
diff -r beb99c802979 -r 59a2fa6992bc compression/zlib/zlib.sh
--- a/compression/zlib/zlib.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/compression/zlib/zlib.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -35,7 +35,6 @@
 	CC="$CC" CFLAGS="$CFLAGS" ./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libz.a
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
diff -r beb99c802979 -r 59a2fa6992bc compression/zstd/zstd.sh
--- a/compression/zstd/zstd.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/compression/zstd/zstd.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -31,10 +31,6 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
-	sed -i \
-		-e '/^lib:/ s/libzstd.a //' \
-		-e '/^install:/ s/install-static //' \
-		lib/Makefile
 	make CC="$CC" CFLAGS="$CFLAGS"
 	make PREFIX=/ LIBDIR=/lib DESTDIR=$DESTDIR install
 
diff -r beb99c802979 -r 59a2fa6992bc core/acl/acl.sh
--- a/core/acl/acl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/acl/acl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
diff -r beb99c802979 -r 59a2fa6992bc core/attr/attr.sh
--- a/core/attr/attr.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/attr/attr.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -52,7 +52,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
diff -r beb99c802979 -r 59a2fa6992bc core/elfutils/elfutils.sh
--- a/core/elfutils/elfutils.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/elfutils/elfutils.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -55,10 +55,6 @@
 		--disable-nls
 	make
 	make install DESTDIR=$DESTDIR
-	rm -f $DESTDIR/lib/libasm.a
-	rm -f $DESTDIR/lib/libdw.a
-	rm -f $DESTDIR/lib/libebl.a
-	rm -f $DESTDIR/lib/libelf.a
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
diff -r beb99c802979 -r 59a2fa6992bc core/eudev/eudev.sh
--- a/core/eudev/eudev.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/eudev/eudev.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--prefix= \
 		--sbindir=/bin \
 		--disable-selinux \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc core/gettext/gettext.sh
--- a/core/gettext/gettext.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/gettext/gettext.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,8 +44,7 @@
 	./configure \
 		--with-included-gettext \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	for i in gettextpo gettextsrc gettextlib intl asprintf; do
diff -r beb99c802979 -r 59a2fa6992bc core/kbd/kbd.sh
--- a/core/kbd/kbd.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/kbd/kbd.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -54,7 +54,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--disable-vlock \
 		$with_nls
diff -r beb99c802979 -r 59a2fa6992bc core/libcap/disable-static.patch
--- a/core/libcap/disable-static.patch	Wed Aug 07 20:01:00 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- libcap/Makefile.orig	2019-03-13 13:08:32.568956164 +0100
-+++ libcap/Makefile	2019-03-13 13:08:50.068536032 +0100
-@@ -18,7 +18,7 @@
- MINLIBNAME=$(MAJLIBNAME).$(MINOR)
- GPERF_OUTPUT = _caps_output.gperf
- 
--all: $(MINLIBNAME) $(STALIBNAME) libcap.pc
-+all: $(MINLIBNAME) libcap.pc
- 
- ifeq ($(BUILD_GPERF),yes)
- USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
-@@ -66,7 +66,6 @@
- 	mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys
- 	install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys
- 	mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR)
--	install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME)
- 	install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME)
- 	ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME)
- 	ln -sf $(MAJLIBNAME) $(FAKEROOT)$(LIBDIR)/$(LIBNAME)
diff -r beb99c802979 -r 59a2fa6992bc core/libcap/libcap.sh
--- a/core/libcap/libcap.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/libcap/libcap.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -33,7 +33,6 @@
 	tar xvf $PKGNAME-$PKGVERSION.tar.xz
 	cd $PKGNAME-$PKGVERSION
 
-	patch -p0 < ../disable-static.patch
 	make BUILD_CC="$CC" CC="$CC" CFLAGS="$CFLAGS"
 	make install RAISE_SETFCAP=no SBINDIR=/bin DESTDIR=$DESTDIR prefix= lib=/lib
 
diff -r beb99c802979 -r 59a2fa6992bc core/procps/procps.sh
--- a/core/procps/procps.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/procps/procps.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -56,7 +56,6 @@
 		--prefix= \
 		--sbindir=/bin \
 		--disable-libselinux \
-		--disable-static \
 		--disable-kill \
 		--enable-shared \
 		$with_nls
diff -r beb99c802979 -r 59a2fa6992bc core/rhash/rhash.sh
--- a/core/rhash/rhash.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/rhash/rhash.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -58,7 +58,6 @@
 	./configure \
 		--target=$CTARGET \
 		--prefix= \
-		--disable-static \
 		--extra-cflags="$CFLAGS" \
 		--extra-ldflags="$LDFLAGS" \
 		$with_nls \
diff -r beb99c802979 -r 59a2fa6992bc core/util-linux/util-linux.sh
--- a/core/util-linux/util-linux.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/core/util-linux/util-linux.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -95,7 +95,6 @@
 		--host=$CHOST \
 		--bindir=/bin \
 		--disable-gtk-doc \
-		--disable-static \
 		--disable-chfn-chsh \
 		--disable-login \
 		--disable-nologin \
diff -r beb99c802979 -r 59a2fa6992bc crypto/nettle/nettle.sh
--- a/crypto/nettle/nettle.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/crypto/nettle/nettle.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc databases/sqlite/sqlite.sh
--- a/databases/sqlite/sqlite.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/databases/sqlite/sqlite.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -58,7 +58,6 @@
 	LIBS="$LIBS" \
 	./configure \
 		-prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_readline \
 		$with_tcl
diff -r beb99c802979 -r 59a2fa6992bc desktop/libwnck2/libwnck2.sh
--- a/desktop/libwnck2/libwnck2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/desktop/libwnck2/libwnck2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -45,7 +45,6 @@
 	LIBS="$LIBS" \
 	./configure \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--localedir=/share/locale
 	make
diff -r beb99c802979 -r 59a2fa6992bc desktop/startup-notification/startup-notification.sh
--- a/desktop/startup-notification/startup-notification.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/desktop/startup-notification/startup-notification.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -40,7 +40,6 @@
 	LIBS="$LIBS" \
 	./configure \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc dev/binutils/binutils.sh
--- a/dev/binutils/binutils.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dev/binutils/binutils.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -66,7 +66,6 @@
 		--target=$CTARGET \
 		--sbindir=/bin \
 		--prefix= \
-		--disable-static \
 		--disable-werror \
 		--enable-shared \
 		--program-prefix=binutils- \
diff -r beb99c802979 -r 59a2fa6992bc dev/flex/flex.sh
--- a/dev/flex/flex.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dev/flex/flex.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -47,7 +47,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc dev/gcc/gcc.sh
--- a/dev/gcc/gcc.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dev/gcc/gcc.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -78,7 +78,6 @@
 		--disable-libsanitizer \
 		--disable-libgomp \
 		--with-pkgversion="Vanilla 0.2" \
-		--disable-static \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc dev/libtool/libtool.sh
--- a/dev/libtool/libtool.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dev/libtool/libtool.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,8 +43,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libltdl.la
diff -r beb99c802979 -r 59a2fa6992bc dev/llvm/llvm.sh
--- a/dev/llvm/llvm.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dev/llvm/llvm.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -22,7 +22,7 @@
 PKGSUMMARY="low level virtual machine compiler infrastructure"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
 PKGDEPENDS="lib/ncurses python/python compression/zlib dev/cmake:build"
-PKGOPTIONS="DOXYGEN FFI LIBCXX LIBEDIT XML LLD NCURSES SPHINX STATIC TARGETS ZLIB"
+PKGOPTIONS="DOXYGEN FFI LIBCXX LIBEDIT XML LLD NCURSES SPHINX TARGETS ZLIB"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CC:=clang}
@@ -37,7 +37,6 @@
 : ${LLD:=yes}
 : ${NCURSES:=yes}
 : ${SPHINX:=no}         # TODO: set to on once sphinx is there.
-: ${STATIC:=no}
 : ${TARGETS:=all}
 : ${ZLIB:=yes}
 
@@ -96,12 +95,6 @@
 	with_sphinx="-DLLVM_ENABLE_SPHINX=Off"
 fi
 
-if [ "$STATIC" = "yes" ]; then
-	with_static="-DLLVM_BUILD_LLVM_DYLIB=Off -DLLVM_LINK_LLVM_DYLIB=Off"
-else
-	with_static="-DLLVM_BUILD_LLVM_DYLIB=On -DLLVM_LINK_LLVM_DYLIB=On"
-fi
-
 if [ "$ZLIB" = "yes" ]; then
 	PKGDEPENDS="compression/zlib $PKGDEPENDS"
 	with_zlib="-DLLVM_ENABLE_ZLIB=On"
@@ -128,6 +121,8 @@
 		-DLLVM_HOST_TRIPLE=$CHOST \
 		-DLLVM_TARGETS_TO_BUILD=$TARGETS \
 		-DLLVM_INSTALL_BINUTILS_SYMLINKS=On \
+		-DLLVM_BUILD_LLVM_DYLIB=On \
+		-DLLVM_LINK_LLVM_DYLIB=On \
 		$with_doxygen \
 		$with_ffi \
 		$with_libcxx \
@@ -136,7 +131,6 @@
 		$with_lld \
 		$with_ncurses \
 		$with_sphinx \
-		$with_static \
 		$with_zlib
 	make
 	make DESTDIR=$DESTDIR install
diff -r beb99c802979 -r 59a2fa6992bc dev/pkgconf/pkgconf.sh
--- a/dev/pkgconf/pkgconf.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dev/pkgconf/pkgconf.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 
diff -r beb99c802979 -r 59a2fa6992bc dns/c-ares/c-ares.sh
--- a/dns/c-ares/c-ares.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dns/c-ares/c-ares.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -46,7 +46,6 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--disable-static \
 		--enable-shared \
 		--prefix=
 	make
diff -r beb99c802979 -r 59a2fa6992bc dns/libidn/libidn.sh
--- a/dns/libidn/libidn.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dns/libidn/libidn.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -52,7 +52,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
diff -r beb99c802979 -r 59a2fa6992bc dns/libidn2/libidn2.sh
--- a/dns/libidn2/libidn2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/dns/libidn2/libidn2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
diff -r beb99c802979 -r 59a2fa6992bc fonts/fontconfig/fontconfig.sh
--- a/fonts/fontconfig/fontconfig.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/fonts/fontconfig/fontconfig.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -45,7 +45,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc fonts/freetype/freetype.sh
--- a/fonts/freetype/freetype.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/fonts/freetype/freetype.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -69,7 +69,6 @@
 		--host=$CHOST \
 		--target=$CTARGET \
 		--prefix= \
-		--disable-static \
 		$with_bzip2 \
 		$with_png \
 		$with_zlib
diff -r beb99c802979 -r 59a2fa6992bc graphics/cairo/cairo.sh
--- a/graphics/cairo/cairo.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/cairo/cairo.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -144,7 +144,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--disable-valgrind \
 		--enable-shared \
 		$with_drm \
diff -r beb99c802979 -r 59a2fa6992bc graphics/libexif/libexif.sh
--- a/graphics/libexif/libexif.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/libexif/libexif.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
diff -r beb99c802979 -r 59a2fa6992bc graphics/libgd/libgd.sh
--- a/graphics/libgd/libgd.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/libgd/libgd.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -116,7 +116,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_fontconfig \
 		$with_freetype \
diff -r beb99c802979 -r 59a2fa6992bc graphics/libjpeg-turbo/libjpeg-turbo.sh
--- a/graphics/libjpeg-turbo/libjpeg-turbo.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/libjpeg-turbo/libjpeg-turbo.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -39,8 +39,7 @@
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DCMAKE_INSTALL_PREFIX= \
-		-DCMAKE_INSTALL_LIBDIR=/lib \
-		-DENABLE_STATIC=Off
+		-DCMAKE_INSTALL_LIBDIR=/lib
 	make
 	make install DESTDIR=$DESTDIR
 	cd ..
diff -r beb99c802979 -r 59a2fa6992bc graphics/libpng/libpng.sh
--- a/graphics/libpng/libpng.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/libpng/libpng.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,8 +43,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libpng*.la
diff -r beb99c802979 -r 59a2fa6992bc graphics/librsvg/librsvg.sh
--- a/graphics/librsvg/librsvg.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/librsvg/librsvg.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -59,7 +59,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_vala
 	make
diff -r beb99c802979 -r 59a2fa6992bc graphics/libtiff/libtiff.sh
--- a/graphics/libtiff/libtiff.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/libtiff/libtiff.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -81,7 +81,6 @@
 		--host=$CHOST \
 		--prefix= \
 		--with-docdir=/share/doc/libtiff \
-		--disable-static \
 		--enable-shared \
 		$with_jpeg \
 		$with_lzma \
diff -r beb99c802979 -r 59a2fa6992bc graphics/libwebp/libwebp.sh
--- a/graphics/libwebp/libwebp.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/libwebp/libwebp.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -73,7 +73,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_jpeg \
 		$with_png \
diff -r beb99c802979 -r 59a2fa6992bc graphics/pixman/pixman.sh
--- a/graphics/pixman/pixman.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/pixman/pixman.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -62,7 +62,6 @@
 		--prefix= \
 		--disable-gnuplot \
 		--disable-gtk \
-		--disable-static \
 		--enable-shared \
 		$with_openmp \
 		$with_png
diff -r beb99c802979 -r 59a2fa6992bc graphics/wayland/wayland.sh
--- a/graphics/wayland/wayland.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/graphics/wayland/wayland.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -61,7 +61,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		$with_dtd \
 		$with_doxygen
 	make
diff -r beb99c802979 -r 59a2fa6992bc irc/irssi/irssi.sh
--- a/irc/irssi/irssi.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/irc/irssi/irssi.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -61,7 +61,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_perl \
 		$with_truecolor
diff -r beb99c802979 -r 59a2fa6992bc lang/tcl/tcl.sh
--- a/lang/tcl/tcl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lang/tcl/tcl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -45,7 +45,6 @@
 		--host=$CHOST \
 		--prefix= \
 		--mandir=/share/man \
-		--disable-static \
 		--enable-shared \
 		--enable-64bit
 	make
diff -r beb99c802979 -r 59a2fa6992bc lang/vala/vala.sh
--- a/lang/vala/vala.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lang/vala/vala.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_valadoc
 	make
diff -r beb99c802979 -r 59a2fa6992bc lib/argp-standalone/argp-standalone.sh
--- a/lib/argp-standalone/argp-standalone.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/argp-standalone/argp-standalone.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -54,7 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	install -Dm0644 argp.h $DESTDIR/include/argp.h
 	rm -f $DESTDIR/lib/libargp.la
-	rm -f $DESTDIR/lib/libargp.a
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
diff -r beb99c802979 -r 59a2fa6992bc lib/dbus-glib/dbus-glib.sh
--- a/lib/dbus-glib/dbus-glib.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/dbus-glib/dbus-glib.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/expat/expat.sh
--- a/lib/expat/expat.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/expat/expat.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,8 +43,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libexpat.la
diff -r beb99c802979 -r 59a2fa6992bc lib/fuse2/fuse2.sh
--- a/lib/fuse2/fuse2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/fuse2/fuse2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/gmp/gmp.sh
--- a/lib/gmp/gmp.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/gmp/gmp.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -49,8 +49,7 @@
 		--prefix= \
 		--enable-cxx \
 		--enable-fat \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libgmp*.la
diff -r beb99c802979 -r 59a2fa6992bc lib/isl/isl.sh
--- a/lib/isl/isl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/isl/isl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/. \
-		--disable-static \
 		--enable-shared \
 		--with-gmp=system
 	make
diff -r beb99c802979 -r 59a2fa6992bc lib/libaio/disable-static.patch
--- a/lib/libaio/disable-static.patch	Wed Aug 07 20:01:00 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- src/Makefile.orig	2019-03-10 15:43:01.694091237 +0100
-+++ src/Makefile	2019-03-10 15:43:10.034128873 +0100
-@@ -13,7 +13,7 @@
- minor=0
- micro=1
- libname=$(soname).$(minor).$(micro)
--all_targets += libaio.a $(libname)
-+all_targets += $(libname)
- 
- all: $(all_targets)
- 
-@@ -54,7 +54,6 @@
- 
- install: $(all_targets)
- 	install -D -m 644 libaio.h $(includedir)/libaio.h
--	install -D -m 644 libaio.a $(libdir)/libaio.a
- 	install -D -m 755 $(libname) $(libdir)/$(libname)
- 	ln -sf $(libname) $(libdir)/$(soname)
- 	ln -sf $(libname) $(libdir)/libaio.so
diff -r beb99c802979 -r 59a2fa6992bc lib/libaio/libaio.sh
--- a/lib/libaio/libaio.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libaio/libaio.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -32,7 +32,6 @@
 	cd $PKGNAME-$PKGNAME-$PKGVERSION
 
 	# TODO: honor CFLAGS.
-	patch -p0 < ../disable-static.patch
 	make CC="$CC" install \
 		prefix=$DESTDIR/ \
 		sysconfdir=$DESTDIR/etc \
diff -r beb99c802979 -r 59a2fa6992bc lib/libc++/libc++.sh
--- a/lib/libc++/libc++.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libc++/libc++.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="C++ standard library from LLVM"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/libcxx-$PKGVERSION.src.tar.xz"
-PKGOPTIONS="ABI COMPILER_RT LIBUNWIND STATIC"
+PKGOPTIONS="ABI COMPILER_RT LIBUNWIND "
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
@@ -30,7 +30,6 @@
 : ${ABI:=libcxxabi}
 : ${COMPILER_RT:=yes}
 : ${LIBUNWIND:=yes}
-: ${STATIC:=no}
 
 if [ "$COMPILER_RT" = "yes" ]; then
 	with_compiler_rt="-DLIBCXX_USE_COMPILER_RT=On"
@@ -44,12 +43,6 @@
 	with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=Off"
 fi
 
-if [ "$STATIC" = "yes" ]; then
-	with_static="-DLIBCXX_ENABLE_SHARED=Off"
-else
-	with_static="-DLIBCXX_ENABLE_SHARED=On"
-fi
-
 build()
 {
 	rm -rf libcxx-$PKGVERSION.src
@@ -68,8 +61,7 @@
 		-DLIBCXX_HAS_MUSL_LIBC=On \
 		-DLIBCXX_HAS_GCC_S_LIB=Off \
 		$with_compiler_rt \
-		$with_libunwind \
-		$with_static
+		$with_libunwind
 	make
 	make install DESTDIR=$DESTDIR
 	cd ..
diff -r beb99c802979 -r 59a2fa6992bc lib/libc++abi/libc++abi.sh
--- a/lib/libc++abi/libc++abi.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libc++abi/libc++abi.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="low level support for the standard C++ library"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/libcxxabi-$PKGVERSION.src.tar.xz"
-PKGOPTIONS="COMPILER_RT LIBUNWIND STATIC"
+PKGOPTIONS="COMPILER_RT LIBUNWIND"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
@@ -29,7 +29,6 @@
 : ${CXXFLAGS:=-O2}
 : ${COMPILER_RT:=yes}
 : ${LIBUNWIND:=yes}
-: ${STATIC:=no}
 
 if [ "$COMPILER_RT" = "yes" ]; then
 	with_compiler_rt="-DLIBCXXABI_USE_COMPILER_RT=Off"
@@ -43,12 +42,6 @@
 	with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=Off"
 fi
 
-if [ "$STATIC" = "yes" ]; then
-	with_static="-DLIBCXXABI_ENABLE_SHARED=Off"
-else
-	with_static="-DLIBCXXABI_ENABLE_SHARED=On"
-fi
-
 build()
 {
 	rm -rf libcxxabi-$PKGVERSION.src
@@ -65,8 +58,7 @@
 		-DCMAKE_INSTALL_PREFIX= \
 		-DLIBCXXABI_LIBCXX_INCLUDES=/include/c++/v1 \
 		$with_compiler_rt \
-		$with_libunwind \
-		$with_static
+		$with_libunwind
 	make
 	make install DESTDIR=$DESTDIR
 	mkdir -p $DESTDIR/include
diff -r beb99c802979 -r 59a2fa6992bc lib/libedit/libedit.sh
--- a/lib/libedit/libedit.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libedit/libedit.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -45,7 +45,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libev/libev.sh
--- a/lib/libev/libev.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libev/libev.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -42,7 +42,6 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--disable-static \
 		--enable-shared \
 		--prefix=
 	make
diff -r beb99c802979 -r 59a2fa6992bc lib/libevdev/libevdev.sh
--- a/lib/libevdev/libevdev.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libevdev/libevdev.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libevent/libevent.sh
--- a/lib/libevent/libevent.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libevent/libevent.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--host=$CHOST \
 		--prefix= \
 		--enable-shared \
-		--disable-static \
 		$with_ssl
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libffi/libffi.sh
--- a/lib/libffi/libffi.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libffi/libffi.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -52,7 +52,6 @@
 		--host=$CHOST \
 		--target=$CTARGET \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libmnl/libmnl.sh
--- a/lib/libmnl/libmnl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libmnl/libmnl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -46,7 +46,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--enable-shared \
-		--disable-static \
 		--prefix=
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libnftnl/libnftnl.sh
--- a/lib/libnftnl/libnftnl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libnftnl/libnftnl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -46,8 +46,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libnftnl.la
diff -r beb99c802979 -r 59a2fa6992bc lib/libtasn1/libtasn1.sh
--- a/lib/libtasn1/libtasn1.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libtasn1/libtasn1.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libunwind/libunwind.sh
--- a/lib/libunwind/libunwind.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libunwind/libunwind.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -21,19 +21,11 @@
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="LLVM's unwinder"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGOPTIONS="STATIC"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}
-: ${STATIC:=no}
-
-if [ "$STATIC" = "yes" ]; then
-	with_static="-DLIBUNWIND_ENABLE_SHARED=Off"
-else
-	with_static="-DLIBUNWIND_ENABLE_SHARED=On"
-fi
 
 build()
 {
@@ -49,8 +41,7 @@
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DCMAKE_INSTALL_PREFIX= \
-		-DLIBUNWIND_USE_COMPILER_RT=On \
-		$with_static
+		-DLIBUNWIND_USE_COMPILER_RT=On
 	make
 	make install DESTDIR=$DESTDIR
 	mkdir -p $DESTDIR/include
diff -r beb99c802979 -r 59a2fa6992bc lib/libuv/libuv.sh
--- a/lib/libuv/libuv.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libuv/libuv.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -45,7 +45,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libwacom/libwacom.sh
--- a/lib/libwacom/libwacom.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libwacom/libwacom.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/libxkbcommon/libxkbcommon.sh
--- a/lib/libxkbcommon/libxkbcommon.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/libxkbcommon/libxkbcommon.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -69,7 +69,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_doxygen \
 		$with_x \
diff -r beb99c802979 -r 59a2fa6992bc lib/lzo/lzo.sh
--- a/lib/lzo/lzo.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/lzo/lzo.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/mpc/mpc.sh
--- a/lib/mpc/mpc.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/mpc/mpc.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,8 +43,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmpc.la
diff -r beb99c802979 -r 59a2fa6992bc lib/mpfr/mpfr.sh
--- a/lib/mpfr/mpfr.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/mpfr/mpfr.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -45,8 +45,7 @@
 		--host=$CHOST \
 		--prefix= \
 		--enable-shared \
-		--enable-thread-safe \
-		--disable-static
+		--enable-thread-safe
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmpfr.la
diff -r beb99c802979 -r 59a2fa6992bc lib/mtdev/mtdev.sh
--- a/lib/mtdev/mtdev.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/mtdev/mtdev.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -40,7 +40,6 @@
 	LIBS="$LIBS" \
 	./configure \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/musl-fts/musl-fts.sh
--- a/lib/musl-fts/musl-fts.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/musl-fts/musl-fts.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,8 +44,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libfts.la
diff -r beb99c802979 -r 59a2fa6992bc lib/musl-obstack/musl-obstack.sh
--- a/lib/musl-obstack/musl-obstack.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/musl-obstack/musl-obstack.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,8 +44,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libobstack.la
diff -r beb99c802979 -r 59a2fa6992bc lib/musl/musl.sh
--- a/lib/musl/musl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/musl/musl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -34,7 +34,7 @@
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
-	./configure --prefix= --disable-static
+	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
diff -r beb99c802979 -r 59a2fa6992bc lib/ncurses/ncurses.sh
--- a/lib/ncurses/ncurses.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/ncurses/ncurses.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -57,11 +57,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	# Remove static libraries.
-	for lib in libmenuw libncursesw libpanelw libformw; do
-		rm -f $DESTDIR/lib/$lib.a
-	done
-
 	# For each wide library, create a input link.
 	for lib in ncurses ncurses++ form panel menu; do
 		echo "INPUT(-l${lib}w)" > $DESTDIR/lib/lib${lib}.so
diff -r beb99c802979 -r 59a2fa6992bc lib/openmp/openmp.sh
--- a/lib/openmp/openmp.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/openmp/openmp.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -21,19 +21,11 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="OpenMP implementation from LLVM"
 PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz"
-PKGOPTIONS="STATIC"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}
-: ${STATIC:=no}
-
-if [ "$STATIC" = "yes" ]; then
-	with_static="-DLIBOMP_ENABLE_SHARED=Off"
-else
-	with_static="-DLIBOMP_ENABLE_SHARED=On"
-fi
 
 build()
 {
@@ -48,8 +40,7 @@
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_COMPILER="$CC" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_INSTALL_PREFIX= \
-		$with_static
+		-DCMAKE_INSTALL_PREFIX=
 	make
 	make install DESTDIR=$DESTDIR
 	cd ..
diff -r beb99c802979 -r 59a2fa6992bc lib/pcre/pcre.sh
--- a/lib/pcre/pcre.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/pcre/pcre.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-jit \
 		--enable-newline-is-anycrlf \
 		--enable-pcregrep-libz \
diff -r beb99c802979 -r 59a2fa6992bc lib/pcre2/pcre2.sh
--- a/lib/pcre2/pcre2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/pcre2/pcre2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -49,7 +49,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--enable-pcre2-16 \
 		--enable-pcre2-32
diff -r beb99c802979 -r 59a2fa6992bc lib/popt/popt.sh
--- a/lib/popt/popt.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/popt/popt.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -51,7 +51,6 @@
 	./configure \
 		--prefix= \
 		--enable-shared \
-		--disable-static \
 		$with_nls
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc lib/readline/readline.sh
--- a/lib/readline/readline.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/readline/readline.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,8 +48,7 @@
 		--host=$CHOST \
 		--prefix= \
 		--with-curses \
-		--enable-shared \
-		--disable-static
+		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 
diff -r beb99c802979 -r 59a2fa6992bc lib/vte/vte.sh
--- a/lib/vte/vte.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/lib/vte/vte.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -54,7 +54,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc mate/libmatemixer/libmatemixer.sh
--- a/mate/libmatemixer/libmatemixer.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/mate/libmatemixer/libmatemixer.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -60,7 +60,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_alsa \
 		$with_pulseaudio
diff -r beb99c802979 -r 59a2fa6992bc mate/marco/marco.sh
--- a/mate/marco/marco.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/mate/marco/marco.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -58,7 +58,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc mate/mate-menus/mate-menus.sh
--- a/mate/mate-menus/mate-menus.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/mate/mate-menus/mate-menus.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_nls
 	make
diff -r beb99c802979 -r 59a2fa6992bc mate/mate-panel/mate-panel.sh
--- a/mate/mate-panel/mate-panel.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/mate/mate-panel/mate-panel.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -70,7 +70,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_wayland \
 		$with_x
diff -r beb99c802979 -r 59a2fa6992bc mate/mate-settings-daemon/mate-settings-daemon.sh
--- a/mate/mate-settings-daemon/mate-settings-daemon.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/mate/mate-settings-daemon/mate-settings-daemon.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -78,7 +78,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_audio \
 		$with_polkit \
diff -r beb99c802979 -r 59a2fa6992bc multimedia/libbluray/libbluray.sh
--- a/multimedia/libbluray/libbluray.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/multimedia/libbluray/libbluray.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -71,7 +71,6 @@
 		--prefix= \
 		--disable-bdjava-jar \
 		--enable-shared \
-		--disable-static \
 		$with_fontconfig \
 		$with_freetype \
 		$with_xml
diff -r beb99c802979 -r 59a2fa6992bc multimedia/libdvdcss/libdvdcss.sh
--- a/multimedia/libdvdcss/libdvdcss.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/multimedia/libdvdcss/libdvdcss.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc multimedia/libdvdnav/libdvdnav.sh
--- a/multimedia/libdvdnav/libdvdnav.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/multimedia/libdvdnav/libdvdnav.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc multimedia/libdvdread/libdvdread.sh
--- a/multimedia/libdvdread/libdvdread.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/multimedia/libdvdread/libdvdread.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--with-libdvdcss
 	make
diff -r beb99c802979 -r 59a2fa6992bc multimedia/libtheora/libtheora.sh
--- a/multimedia/libtheora/libtheora.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/multimedia/libtheora/libtheora.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -41,7 +41,6 @@
 	./configure \
 		--prefix= \
 		--disable-examples \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR docdir=/share/doc/$PKGNAME
diff -r beb99c802979 -r 59a2fa6992bc network/curl/curl.sh
--- a/network/curl/curl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/network/curl/curl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -83,7 +83,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--with-ca-bundle=/etc/ssl/cert.pem \
 		--without-cyassl \
diff -r beb99c802979 -r 59a2fa6992bc network/dbus/dbus.sh
--- a/network/dbus/dbus.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/network/dbus/dbus.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -67,7 +67,6 @@
 		--prefix= \
 		--with-system-pid-file=/var/run/dbus.pid \
 		--disable-systemd \
-		--disable-static \
 		--enable-shared \
 		$with_selinux \
 		$with_x
diff -r beb99c802979 -r 59a2fa6992bc network/dhcpcd/dhcpcd.sh
--- a/network/dhcpcd/dhcpcd.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/network/dhcpcd/dhcpcd.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,8 +48,7 @@
 		--prefix= \
 		--sbindir=/bin \
 		--mandir=/share/man \
-		--datadir=/share \
-		--disable-static
+		--datadir=/share
 	make
 	make install DESTDIR=$DESTDIR
 	install -Dm0644 ../dhcpcd $DESTDIR/etc/rc.d/dhcpcd
diff -r beb99c802979 -r 59a2fa6992bc network/libpsl/libpsl.sh
--- a/network/libpsl/libpsl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/network/libpsl/libpsl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc network/nghttp2/nghttp2.sh
--- a/network/nghttp2/nghttp2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/network/nghttp2/nghttp2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -61,7 +61,6 @@
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--disable-static \
 		--enable-shared \
 		--prefix= \
 		--without-systemd \
diff -r beb99c802979 -r 59a2fa6992bc perl/perl/perl.sh
--- a/perl/perl/perl.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/perl/perl/perl.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -38,7 +38,6 @@
 
 	BUILD_ZLIB=0 \
 	BUILD_BZIP2=0 \
-	BUILD_STATIC=0 \
 	./Configure -des \
 		-Dcc="$CC" \
 		-Doptimize="$CFLAGS" \
diff -r beb99c802979 -r 59a2fa6992bc print/cups/cups.sh
--- a/print/cups/cups.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/print/cups/cups.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -79,7 +79,6 @@
 		--host=$CHOST \
 		--prefix= \
 		--sbindir=/bin \
-		--disable-static \
 		--disable-systemd \
 		--enable-shared \
 		--without-rcdir \
diff -r beb99c802979 -r 59a2fa6992bc ruby/ruby/ruby.sh
--- a/ruby/ruby/ruby.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/ruby/ruby/ruby.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--without-git
 	make
diff -r beb99c802979 -r 59a2fa6992bc security/libsecret/libsecret.sh
--- a/security/libsecret/libsecret.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/security/libsecret/libsecret.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -70,7 +70,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_crypto \
 		$with_vala
diff -r beb99c802979 -r 59a2fa6992bc security/shadow/shadow.sh
--- a/security/shadow/shadow.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/security/shadow/shadow.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -95,7 +95,6 @@
 		--prefix= \
 		--bindir=/bin \
 		--sbindir=/bin \
-		--disable-static \
 		--enable-shared \
 		$with_acl \
 		$with_attr \
diff -r beb99c802979 -r 59a2fa6992bc text/libcroco/libcroco.sh
--- a/text/libcroco/libcroco.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/text/libcroco/libcroco.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc text/libxml2/libxml2.sh
--- a/text/libxml2/libxml2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/text/libxml2/libxml2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -81,7 +81,6 @@
 		--docdir=/share/doc/$PKGNAME \
 		--with-html-dir=/share/doc/$PKGNAME/html \
 		--with-html-subdir="" \
-		--disable-static \
 		--enable-shared \
 		$with_icu \
 		$with_lzma \
diff -r beb99c802979 -r 59a2fa6992bc text/libxslt/libxslt.sh
--- a/text/libxslt/libxslt.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/text/libxslt/libxslt.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -59,7 +59,6 @@
 		--prefix= \
 		--with-html-dir=/share/doc/$PKGNAME/html \
 		--with-html-subdir="" \
-		--disable-static \
 		--enable-shared \
 		$with_crypto
 	make
diff -r beb99c802979 -r 59a2fa6992bc x11/libdmx/libdmx.sh
--- a/x11/libdmx/libdmx.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libdmx/libdmx.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libfontenc/libfontenc.sh
--- a/x11/libfontenc/libfontenc.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libfontenc/libfontenc.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libfs/libfs.sh
--- a/x11/libfs/libfs.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libfs/libfs.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -38,7 +38,7 @@
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
 	LIBS="$LIBS" \
-	./configure --prefix= --disable-static --enable-shared
+	./configure --prefix= --enable-shared
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libFS.la
diff -r beb99c802979 -r 59a2fa6992bc x11/libice/libice.sh
--- a/x11/libice/libice.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libice/libice.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libpciaccess/libpciaccess.sh
--- a/x11/libpciaccess/libpciaccess.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libpciaccess/libpciaccess.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libsm/libsm.sh
--- a/x11/libsm/libsm.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libsm/libsm.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -53,7 +53,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_uuid
 	make
diff -r beb99c802979 -r 59a2fa6992bc x11/libx11/libx11.sh
--- a/x11/libx11/libx11.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libx11/libx11.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -47,7 +47,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxau/libxau.sh
--- a/x11/libxau/libxau.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxau/libxau.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxaw/libxaw.sh
--- a/x11/libxaw/libxaw.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxaw/libxaw.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -50,7 +50,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxcb/libxcb.sh
--- a/x11/libxcb/libxcb.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxcb/libxcb.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxcomposite/libxcomposite.sh
--- a/x11/libxcomposite/libxcomposite.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxcomposite/libxcomposite.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxdamage/libxdamage.sh
--- a/x11/libxdamage/libxdamage.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxdamage/libxdamage.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxdmcp/libxdmcp.sh
--- a/x11/libxdmcp/libxdmcp.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxdmcp/libxdmcp.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -45,7 +45,6 @@
 		--host=$CHOST \
 		--target=$CTARGET \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxext/libxext.sh
--- a/x11/libxext/libxext.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxext/libxext.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxfixes/libxfixes.sh
--- a/x11/libxfixes/libxfixes.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxfixes/libxfixes.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxfont2/libxfont2.sh
--- a/x11/libxfont2/libxfont2.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxfont2/libxfont2.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -61,7 +61,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		$with_bzip2 \
 		$with_freetype
diff -r beb99c802979 -r 59a2fa6992bc x11/libxft/libxft.sh
--- a/x11/libxft/libxft.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxft/libxft.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -47,7 +47,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxi/libxi.sh
--- a/x11/libxi/libxi.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxi/libxi.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxinerama/libxinerama.sh
--- a/x11/libxinerama/libxinerama.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxinerama/libxinerama.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxkbfile/libxkbfile.sh
--- a/x11/libxkbfile/libxkbfile.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxkbfile/libxkbfile.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxmu/libxmu.sh
--- a/x11/libxmu/libxmu.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxmu/libxmu.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxpm/libxpm.sh
--- a/x11/libxpm/libxpm.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxpm/libxpm.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -49,7 +49,6 @@
 		--host=$CHOST \
 		--target=$CTARGET \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxpresent/libxpresent.sh
--- a/x11/libxpresent/libxpresent.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxpresent/libxpresent.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxrandr/libxrandr.sh
--- a/x11/libxrandr/libxrandr.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxrandr/libxrandr.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxrender/libxrender.sh
--- a/x11/libxrender/libxrender.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxrender/libxrender.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxres/libxres.sh
--- a/x11/libxres/libxres.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxres/libxres.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxscrnsaver/libxscrnsaver.sh
--- a/x11/libxscrnsaver/libxscrnsaver.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxscrnsaver/libxscrnsaver.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -47,7 +47,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxshmfence/libxshmfence.sh
--- a/x11/libxshmfence/libxshmfence.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxshmfence/libxshmfence.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared \
 		--enable-futex
 	make
diff -r beb99c802979 -r 59a2fa6992bc x11/libxt/libxt.sh
--- a/x11/libxt/libxt.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxt/libxt.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxtrap/libxtrap.sh
--- a/x11/libxtrap/libxtrap.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxtrap/libxtrap.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxtst/libxtst.sh
--- a/x11/libxtst/libxtst.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxtst/libxtst.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxv/libxv.sh
--- a/x11/libxv/libxv.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxv/libxv.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxvmc/libxvmc.sh
--- a/x11/libxvmc/libxvmc.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxvmc/libxvmc.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -48,7 +48,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxxf86dga/libxxf86dga.sh
--- a/x11/libxxf86dga/libxxf86dga.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxxf86dga/libxxf86dga.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxxf86misc/libxxf86misc.sh
--- a/x11/libxxf86misc/libxxf86misc.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxxf86misc/libxxf86misc.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/libxxf86vm/libxxf86vm.sh
--- a/x11/libxxf86vm/libxxf86vm.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/libxxf86vm/libxxf86vm.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/xcb-util-cursor/xcb-util-cursor.sh
--- a/x11/xcb-util-cursor/xcb-util-cursor.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/xcb-util-cursor/xcb-util-cursor.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/xcb-util-image/xcb-util-image.sh
--- a/x11/xcb-util-image/xcb-util-image.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/xcb-util-image/xcb-util-image.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/xcb-util-keysyms/xcb-util-keysyms.sh
--- a/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/xcb-util-renderutil/xcb-util-renderutil.sh
--- a/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/xcb-util-wm/xcb-util-wm.sh
--- a/x11/xcb-util-wm/xcb-util-wm.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/xcb-util-wm/xcb-util-wm.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -44,7 +44,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR
diff -r beb99c802979 -r 59a2fa6992bc x11/xcb-util/xcb-util.sh
--- a/x11/xcb-util/xcb-util.sh	Wed Aug 07 20:01:00 2019 +0200
+++ b/x11/xcb-util/xcb-util.sh	Wed Aug 07 20:05:00 2019 +0200
@@ -43,7 +43,6 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		--disable-static \
 		--enable-shared
 	make
 	make install DESTDIR=$DESTDIR