diff --git a/scripts/makedeb.sh b/scripts/makedeb.sh index 204266666f..031fee4f69 100755 --- a/scripts/makedeb.sh +++ b/scripts/makedeb.sh @@ -16,10 +16,14 @@ if ! [ -e version.sh ]; then exit 1 fi +buildopts= + # TODO: derive this list automatically? case $target in ubuntu16) depends="libqt4-designer (>= 4.8.6), libqt4-xml (>= 4.8.6), libqt4-sql (>= 4.8.6), libqt4-network (>= 4.8.6), libqtcore4 (>= 4.8.6), libqtgui4 (>= 4.8.6), zlib1g (>= 1.2.8), libgit2-24 (>= 0.24.0), libruby2.3 (>= 2.3.1), python3 (>= 3.5.1), libpython3.5 (>= 3.5.1), libstdc++6 (>= 4.6.3), libc6 (>= 2.15)" + # No HTTPS support - that is somewhat useless + buildopts=-nolibgit2 ;; ubuntu18) depends="libqt4-designer (>= 4.8.7), libqt4-xml (>= 4.8.7), libqt4-sql (>= 4.8.7), libqt4-network (>= 4.8.7), libqtcore4 (>= 4.8.7), libqtgui4 (>= 4.8.7), zlib1g (>= 1.2.11), libgit2-26 (>= 0.26.0), libruby2.5 (>= 2.5.1), python3 (>= 3.6.5), libpython3.6 (>= 3.6.5), libstdc++6 (>= 8), libc6 (>= 2.27)" @@ -62,7 +66,8 @@ rm -rf $bininstdir ./build.sh -j2 \ -bin $bininstdir \ -build $builddir \ - -rpath /$libdir + -rpath /$libdir \ + $buildopts if [ "$bits" = "32" ]; then arch="i386" diff --git a/scripts/rpm-data/klayout.spec b/scripts/rpm-data/klayout.spec index 5a9bad6f24..b6fc8e4017 100644 --- a/scripts/rpm-data/klayout.spec +++ b/scripts/rpm-data/klayout.spec @@ -35,6 +35,7 @@ AutoReqProv: no %if "%{target_system}" == "centos8" Requires: ruby >= 2.5.5 Requires: python3 >= 3.6.0 +Requires: libgit2 >= 0.26.8 Requires: qt5-qtbase >= 5.11.1 Requires: qt5-qtmultimedia >= 5.11.1 Requires: qt5-qtxmlpatterns >= 5.11.1