From f4001a4d839184c596f67ca2205333bf645a6f81 Mon Sep 17 00:00:00 2001 From: Carlos Venegas Date: Tue, 30 Jan 2024 00:06:18 +0100 Subject: [PATCH] Add all dynamic libraries of oss-cad-suite that not enlarge a lot the package and is needed to support new tools --- build.sh | 2 +- scripts/install_darwin.sh | 34 +---------------------- scripts/install_darwin_arm64.sh | 33 +---------------------- scripts/install_linux_x64.sh | 48 +-------------------------------- scripts/install_windows_x64.sh | 22 ++------------- 5 files changed, 6 insertions(+), 133 deletions(-) diff --git a/build.sh b/build.sh index 27ccfa5..5224dcd 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,7 @@ NAME=oss-cad-suite # -- set the new date YEAR=2024 MONTH=01 -DAY=28 +DAY=29 # -- Set the version for the new package VERSION=0.1.0 diff --git a/scripts/install_darwin.sh b/scripts/install_darwin.sh index 0e5ea93..e5d970a 100644 --- a/scripts/install_darwin.sh +++ b/scripts/install_darwin.sh @@ -12,8 +12,7 @@ install $SOURCE_DIR/libexec/realpath $PACKAGE_DIR/libexec # -- Libraries -install $SOURCE_DIR/lib/libusb-1.0.0.dylib $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libftdi1.2.5.0.dylib $PACKAGE_DIR/lib +install $SOURCE_DIR/lib/lib* $PACKAGE_DIR/lib # --------------------------- # -- Iceprog @@ -31,13 +30,7 @@ install $SOURCE_DIR/bin/yosys-abc $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/yosys-abc $PACKAGE_DIR/libexec # -- Libraries -install $SOURCE_DIR/lib/libreadline* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libffi* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libz* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libtcl* $PACKAGE_DIR/lib install $SOURCE_DIR/lib/yosys-abc $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libncurses* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_iostreams* $PACKAGE_DIR/lib # -- Share mkdir -p $PACKAGE_DIR/share/yosys @@ -73,29 +66,6 @@ cp -r $SOURCE_DIR/share/icebox/* $PACKAGE_DIR/share/icebox install $TEMPLATE/nextpnr-ice40 $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/nextpnr-ice40 $PACKAGE_DIR/libexec -# -- Libraries -install $SOURCE_DIR/lib/libboost_filesystem* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_chrono* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_system* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_regex* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_date* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_atom* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_program_options* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_thread* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpython3.8* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpng16* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libharfbuzz* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libexpat* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libharfbuzz* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicui18n* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicuuc* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpcre* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libglib-2.0* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicudata* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libfreetype* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libgraphite2* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libintl* $PACKAGE_DIR/lib - # -- Python 3.11 # -- The whole python 3.11 should be copied in lib/python3.11 mkdir -p $PACKAGE_DIR/lib/python3.11 @@ -145,7 +115,6 @@ install $SOURCE_DIR/libexec/nextpnr-ecp5 $PACKAGE_DIR/libexec install $SOURCE_DIR/bin/openFPGALoader $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/openFPGALoader $PACKAGE_DIR/libexec -install $SOURCE_DIR/lib/libhidapi* $PACKAGE_DIR/lib # ------------------------ # -- DFU @@ -185,7 +154,6 @@ install $SOURCE_DIR/libexec/ivlpp $PACKAGE_DIR/libexec # -- Libraries mkdir -p $PACKAGE_DIR/lib/ivl cp -r $SOURCE_DIR/lib/ivl/* $PACKAGE_DIR/lib/ivl -install $SOURCE_DIR/lib/libbz* $PACKAGE_DIR/lib # -------------------------------------- # -- Verilator diff --git a/scripts/install_darwin_arm64.sh b/scripts/install_darwin_arm64.sh index a80caa9..24330b3 100644 --- a/scripts/install_darwin_arm64.sh +++ b/scripts/install_darwin_arm64.sh @@ -12,8 +12,7 @@ install $SOURCE_DIR/libexec/realpath $PACKAGE_DIR/libexec # -- Libraries -install $SOURCE_DIR/lib/libusb-1.0.0.dylib $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libftdi1.2.5.0.dylib $PACKAGE_DIR/lib +install $SOURCE_DIR/lib/lib* $PACKAGE_DIR/lib # --------------------------- # -- Iceprog @@ -31,13 +30,7 @@ install $SOURCE_DIR/bin/yosys-abc $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/yosys-abc $PACKAGE_DIR/libexec # -- Libraries -install $SOURCE_DIR/lib/libreadline* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libffi* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libz* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libtcl* $PACKAGE_DIR/lib install $SOURCE_DIR/lib/yosys-abc $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libncurses* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_iostreams* $PACKAGE_DIR/lib # -- Share mkdir -p $PACKAGE_DIR/share/yosys @@ -73,28 +66,6 @@ cp -r $SOURCE_DIR/share/icebox/* $PACKAGE_DIR/share/icebox install $TEMPLATE/nextpnr-ice40 $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/nextpnr-ice40 $PACKAGE_DIR/libexec -# -- Libraries -install $SOURCE_DIR/lib/libboost_filesystem* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_chrono* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_system* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_regex* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_date* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_atom* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_program_options* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_thread* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpython3.8* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpng16* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libharfbuzz* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libexpat* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libharfbuzz* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicui18n* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicuuc* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpcre* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libglib-2.0* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicudata* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libfreetype* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libgraphite2* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libintl* $PACKAGE_DIR/lib # -- Python 3.11 # -- The whole python 3.8 should be copied in lib/python3.8 @@ -145,7 +116,6 @@ install $SOURCE_DIR/libexec/nextpnr-ecp5 $PACKAGE_DIR/libexec install $SOURCE_DIR/bin/openFPGALoader $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/openFPGALoader $PACKAGE_DIR/libexec -install $SOURCE_DIR/lib/libhidapi* $PACKAGE_DIR/lib # ------------------------ # -- DFU @@ -185,7 +155,6 @@ install $SOURCE_DIR/libexec/ivlpp $PACKAGE_DIR/libexec # -- Libraries mkdir -p $PACKAGE_DIR/lib/ivl cp -r $SOURCE_DIR/lib/ivl/* $PACKAGE_DIR/lib/ivl -install $SOURCE_DIR/lib/libbz* $PACKAGE_DIR/lib # -------------------------------------- # -- Verilator diff --git a/scripts/install_linux_x64.sh b/scripts/install_linux_x64.sh index b1fda6e..7d4c799 100644 --- a/scripts/install_linux_x64.sh +++ b/scripts/install_linux_x64.sh @@ -14,12 +14,7 @@ install $TOOL_SYSTEM_SRC/bin/ftdi_eeprom $PACKAGE_DIR/bin # -- Libraries install $SOURCE_DIR/lib/ld-linux-x86-64.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libc.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libudev.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpthread.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/librt.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libusb-1.0.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libftdi1.so* $PACKAGE_DIR/lib +install $SOURCE_DIR/lib/lib* $PACKAGE_DIR/lib # --------------------------- # -- Iceprog @@ -39,15 +34,6 @@ install $SOURCE_DIR/bin/yosys-abc $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/yosys-abc $PACKAGE_DIR/libexec # -- Libraries -install $SOURCE_DIR/lib/libstdc++.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libm.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libreadline.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libffi.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libdl.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libz.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libtcl* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libgcc_s.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libtinfo.so* $PACKAGE_DIR/lib install $SOURCE_DIR/lib/yosys-abc $PACKAGE_DIR/lib # -- Share @@ -83,36 +69,6 @@ cp -r $SOURCE_DIR/share/icebox/* $PACKAGE_DIR/share/icebox install $TEMPLATE/nextpnr-ice40 $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/nextpnr-ice40 $PACKAGE_DIR/libexec -# -- Libraries -install $SOURCE_DIR/lib/libboost_filesystem.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_program_options.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libboost_thread.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpython3.8.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libQt5Widgets.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libQt5Gui.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libQt5Core.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libGL.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libGLdispatch.so.0* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libGLX.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpng16.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libharfbuzz.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libexpat.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libutil.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libharfbuzz.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicui18n.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicuuc.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpcre2-16.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libdouble-conversion.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libglib-2.0.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libicudata.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libpcre.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libbsd.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libfreetype.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libgraphite2.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libX11.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libxcb.so* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libXau.so.6* $PACKAGE_DIR/lib -install $SOURCE_DIR/lib/libXdmcp.so.6* $PACKAGE_DIR/lib # -- Python 3.11 # -- The whole python 3.11 should be copied in lib/python3.11 @@ -171,7 +127,6 @@ install $SOURCE_DIR/libexec/iceprogduino $PACKAGE_DIR/libexec install $SOURCE_DIR/bin/icesprog $PACKAGE_DIR/bin install $SOURCE_DIR/libexec/icesprog $PACKAGE_DIR/libexec -install $SOURCE_DIR/lib/libhidapi-hidraw.so* $PACKAGE_DIR/lib # --------------------------------------------------------- # -- SIMULATION!! @@ -192,7 +147,6 @@ install $SOURCE_DIR/libexec/ivlpp $PACKAGE_DIR/libexec # -- Libraries mkdir -p $PACKAGE_DIR/lib/ivl cp -r $SOURCE_DIR/lib/ivl/* $PACKAGE_DIR/lib/ivl -install $SOURCE_DIR/lib/libbz2* $PACKAGE_DIR/lib # -------------------------------------- # -- Verilator diff --git a/scripts/install_windows_x64.sh b/scripts/install_windows_x64.sh index 19a0566..7b3749d 100644 --- a/scripts/install_windows_x64.sh +++ b/scripts/install_windows_x64.sh @@ -31,15 +31,9 @@ install $SOURCE_DIR/bin/yosys-abc.exe $PACKAGE_DIR/bin # -- Libraries - install $SOURCE_DIR/lib/libstdc++*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libreadline*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libffi*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libdl.dll $PACKAGE_DIR/lib + install $SOURCE_DIR/lib/lib* $PACKAGE_DIR/lib install $SOURCE_DIR/lib/tcl*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libgcc_s*.dll $PACKAGE_DIR/lib install $SOURCE_DIR/lib/zlib1.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libwinpthread*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libtermcap*.dll $PACKAGE_DIR/lib # -- Share mkdir -p $PACKAGE_DIR/share/yosys @@ -68,24 +62,13 @@ install $SOURCE_DIR/bin/nextpnr-ice40.exe $PACKAGE_DIR/bin # -- Libraries - install $SOURCE_DIR/lib/libboost_filesystem*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libboost_program_options*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libboost_thread*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libpython*.dll $PACKAGE_DIR/lib install $SOURCE_DIR/lib/Qt5Widgets*.dll $PACKAGE_DIR/lib install $SOURCE_DIR/lib/Qt5Gui*.dll $PACKAGE_DIR/lib install $SOURCE_DIR/lib/Qt5Core*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libpng16*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libharfbuzz*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libexpat*.dll $PACKAGE_DIR/lib install $SOURCE_DIR/lib/icuuc*.dll $PACKAGE_DIR/lib install $SOURCE_DIR/lib/iconv*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libpcre2-*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libintl*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libglib-2.0* $PACKAGE_DIR/lib install $SOURCE_DIR/lib/icudata*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libpcre*.dll $PACKAGE_DIR/lib - install $SOURCE_DIR/lib/libfreetype*.dll $PACKAGE_DIR/lib + # -- Python 3.11 # -- The whole python 3.8 should be copied in lib/python3.11 @@ -150,7 +133,6 @@ install $SOURCE_DIR/bin/iverilog-vpi.exe $PACKAGE_DIR/bin # -- Libraries mkdir -p $PACKAGE_DIR/lib/ivl cp -r $SOURCE_DIR/lib/ivl/* $PACKAGE_DIR/lib/ivl -install $SOURCE_DIR/lib/libbz2*.dll $PACKAGE_DIR/lib