Skip to content

Commit

Permalink
Fixing build issues on Ubuntu 16, dependencies on CentOS 8
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koefferlein committed Nov 15, 2023
1 parent d91c86c commit 4d8e08b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
7 changes: 6 additions & 1 deletion scripts/makedeb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions scripts/rpm-data/klayout.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4d8e08b

Please sign in to comment.