From 6c490f6cb69ce32a3a3e7c712f913b0a238a5c34 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 28 Aug 2016 15:04:39 +0200 Subject: [PATCH] Removing static library from yajl, libev and xcb-util-xrm --- satellites/libev.sat | 2 +- satellites/python3-qt5.sat | 6 +++++- satellites/xcb-util-xrm.sat | 2 +- satellites/yajl.sat | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/satellites/libev.sat b/satellites/libev.sat index 19730dd..19481c0 100644 --- a/satellites/libev.sat +++ b/satellites/libev.sat @@ -13,6 +13,6 @@ cd "$name-$version" # Don't install the libevent compatibility header, as it conflicts with the actual libevent. sed -i -e '/include_HEADERS/s/event.h//' Makefile.in -compile_configure +compile_configure -- --disable-static # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/python3-qt5.sat b/satellites/python3-qt5.sat index fdb9023..a245833 100644 --- a/satellites/python3-qt5.sat +++ b/satellites/python3-qt5.sat @@ -10,7 +10,11 @@ dlextract "http://sourceforge.net/projects/pyqt/files/$name/PyQt-$version/${name header_end cd "${name}_gpl-$version" -python3 configure.py --qmake "$(command -v "$(compile_qt_get_cmd qmake 5)")" --confirm-license + +qmake="$(command -v "$(compile_qt_get_cmd qmake 5)")" || echo "Missing qmake for Qt5" +[ "$qmake" ] + +python3 configure.py --qmake "$qmake" --confirm-license make make DESTDIR="$dir_install" INSTALL_ROOT="$dir_install" install diff --git a/satellites/xcb-util-xrm.sat b/satellites/xcb-util-xrm.sat index 5e829b7..4564cc6 100644 --- a/satellites/xcb-util-xrm.sat +++ b/satellites/xcb-util-xrm.sat @@ -9,6 +9,6 @@ dlextract "https://github.com/Airblader/$name/releases/download/v$version/$name- header_end cd "$name-$version" -compile_configure +compile_configure -- --disable-static # vim:set tabstop=4 shiftwidth=4 syntax=sh et: diff --git a/satellites/yajl.sat b/satellites/yajl.sat index 412b221..7596b2f 100644 --- a/satellites/yajl.sat +++ b/satellites/yajl.sat @@ -11,6 +11,10 @@ header_end cd "$name-$version" +# Don't build the static library +sed -i -e '/yajl_s/d' \ + -e '/COMMAND ${CMAKE_COMMAND}/d' src/CMakeLists.txt + # Fix install dirs sed -i -e "s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_libdir")/" \ -e "/INSTALL(/s/share/$(safe_sed "$dir_datadir")/" src/CMakeLists.txt