AFic linux build.

Author: Maxwell175

Modules/Setup

@@ -127,6 +127,7 @@ PYTHONPATH=$(COREPYTHONPATH)
 # detail; also note that *static* or *disabled* cancels this effect):
 
 #*shared*
+*static*
 
 # Modules that should always be present (POSIX and Windows):
 
@@ -211,11 +212,8 @@ zlib  zlibmodule.c -l:libz.a
 #_hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) -lcrypto
 
 # To statically link OpenSSL:
-_ssl _ssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) \
-    -l:libssl.a \
-    -l:libcrypto.a
-_hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) \
-    -l:libcrypto.a
+_ssl _ssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) -l:libssl.a -l:libcrypto.a
+_hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) -l:libcrypto.a
 
 # The _tkinter module.
 #
@@ -228,37 +226,7 @@ _hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) \
 # done by the shell's "read" command and it may not be implemented on
 # every system.
 
-# *** Always uncomment this (leave the leading underscore in!):
-_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT $(TCLTK_INCLUDES) $(TCLTK_LIBS) \
-# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
-#	-L/usr/local/lib \
-# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-#	-I/usr/include/tcl8.6 \
-# *** Uncomment and edit to reflect where your X11 header files are:
-#	-I/usr/X11R6/include \
-# *** Or uncomment this for Solaris:
-#	-I/usr/openwin/include \
-# *** Uncomment and edit for Tix extension only:
-#	-DWITH_TIX -ltix8.1.8.2 \
-# *** Uncomment and edit for BLT extension only:
-#	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
-# *** Uncomment and edit for PIL (TkImaging) extension only:
-#     (See http://www.pythonware.com/products/pil/ for more info)
-#	-DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
-# *** Uncomment and edit for TOGL extension only:
-#	-DWITH_TOGL togl.c \
-# *** Uncomment and edit to reflect your Tcl/Tk versions:
-	-l:libtk8.6.a -l:libtcl8.6.a \
-# *** Uncomment and edit to reflect where your X11 libraries are:
-#	-L/usr/X11R6/lib \
-# *** Or uncomment this for Solaris:
-#	-L/usr/openwin/lib \
-# *** Uncomment these for TOGL extension only:
-#	-lGL -lGLU -lXext -lXmu \
-# *** Uncomment for AIX:
-#	-lld \
-# *** Always uncomment this; X11 libraries to link with:
-	  -l:libX11.a -l:libxcb.a -l:libXss.a -l:libfontconfig.a -l:libXft.a -l:libXext.a -l:libXrandr.a -l:libXau.a -l:libXrender.a -l:libXdmcp.a -l:libfreetype.a -l:libexpat.a -l:libpng.a -l:libharfbuzz.a -l:libX11.a -l:libxcb.a
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT $(TCLTK_INCLUDES) $(TCLTK_LIBS) -l:libtk8.6.a -l:libtcl8.6.a -l:libX11.a -l:libxcb.a -l:libXss.a -l:libfontconfig.a -l:libXft.a -l:libXext.a -l:libXrandr.a -l:libXau.a -l:libXrender.a -l:libXdmcp.a -l:libfreetype.a -l:libexpat.a -l:libpng.a -l:libharfbuzz.a -l:libX11.a -l:libxcb.a
 
 # Some system have -lcurses
 _curses -l:libncursesw.a _cursesmodule.c
@@ -310,6 +278,20 @@ nis
 _ctypes_test
 ossaudiodev
 xxlimited
+-lcrypto
+-lssl
+-ltk8.6
+-lz
+_sqlite3
+_testclinic
+_testclinic_limited
+_testinternalcapi
+_testlimitedcapi
+_uuid
+xxlimited_35
+xxsubtype
+_gdbm
+readline
 #_lzma
 #
 # _sqlite3 _tkinter _curses pyexpat

build.sh

@@ -83,10 +83,10 @@ download_file() {
   return 1
 }
 
-if [ ! -d ncurses-6.4 ]; then
-download_file https://ftp.gnu.org/gnu/ncurses/ncurses-6.4.tar.gz ncurses.tar.gz
+if [ ! -d ncurses-6.5 ]; then
+download_file https://ftp.gnu.org/gnu/ncurses/ncurses-6.5.tar.gz ncurses.tar.gz
 tar -xf ncurses.tar.gz
-cd ncurses-6.4
+cd ncurses-6.5
 ./configure --prefix=${PREFIX} --disable-shared --enable-termcap --enable-widec --enable-getcap --without-cxx-binding
 make libs -j$(nproc --all)
 make install.libs install.includes
@@ -342,10 +342,10 @@ make install
 cd ..
 fi
 
-if [ ! -d tcl8.6.13 ]; then
-download_file http://downloads.sourceforge.net/project/tcl/Tcl/8.6.13/tcl8.6.13-src.tar.gz tcl.tar.gz
+if [ ! -d tcl8.6.15 ]; then
+download_file http://downloads.sourceforge.net/project/tcl/Tcl/8.6.15/tcl8.6.15-src.tar.gz tcl.tar.gz
 tar -xf tcl.tar.gz
-cd tcl8.6.13
+cd tcl8.6.15
 rm -rf pkgs/tdbc* pkgs/sqlite*
 cd unix
 ./configure --prefix=${PREFIX} --enable-shared=no --enable-threads
@@ -364,10 +364,10 @@ make install
 cd ..
 fi
 
-if [ ! -d tk8.6.13 ]; then
-download_file http://downloads.sourceforge.net/project/tcl/Tcl/8.6.13/tk8.6.13-src.tar.gz tk.tar.gz
+if [ ! -d tk8.6.15 ]; then
+download_file http://downloads.sourceforge.net/project/tcl/Tcl/8.6.15/tk8.6.15-src.tar.gz tk.tar.gz
 tar -xf tk.tar.gz
-cd tk8.6.13/unix
+cd tk8.6.15/unix
 ./configure --prefix=${PREFIX} --enable-shared=no --enable-threads --with-tcl=${PREFIX}/lib
 make -j$(nproc --all) "X11_LIB_SWITCHES=-l:libX11.a -l:libxcb.a -l:libXss.a -l:libfontconfig.a -l:libXft.a -l:libXext.a -l:libXrandr.a -l:libXau.a -l:libXrender.a -l:libXdmcp.a -l:libfreetype.a -l:libexpat.a -l:libpng.a -l:libharfbuzz.a -l:libX11.a -l:libxcb.a -l:libbz2.a"
 make install
@@ -432,18 +432,23 @@ make -j $(nproc --all) \
         EXTRA_CFLAGS="-flto -fuse-linker-plugin -fno-fat-lto-objects" \
         profile-opt
 
-make build_all_merge_profile
-
 # Delayed deletion of old installation, to avoid having it not there for testing purposes
 # while compiling, which is slow due to PGO beign applied.
-$ELEVATE rm -rf "$target" && $ELEVATE make install
+$ELEVATE rm -rf "$target" && $ELEVATE make libinstall install
+
+rm pybuilddir.txt
 
 # Make sure to have pip installed, might even remove it afterwards, Debian
 # e.g. doesn't include it.
 $ELEVATE mv "$target/lib/python${long_version}/pip.py" "$target/lib/python${long_version}/pip.py.bak" && \
     $ELEVATE "$target/bin/python${long_version}" -m ensurepip && \
     $ELEVATE mv "$target/lib/python${long_version}/pip.py.bak" "$target/lib/python${long_version}/pip.py"
 
+# Copy embedded data
+$ELEVATE mv ${PREFIX}/lib/libmp_embed.a "$target/lib/libmp_embed.a"
+
+cp -v Modules/_hacl/libHacl_Hash_SHA2.a "$target/lib/"
+
 $ELEVATE mkdir -p "$target/Embedded"
 # The object file usually gets deleted during the build, so make sure to recompile here just in case.
 rm -f Embedded/mp_embed.o
@@ -474,5 +479,6 @@ $ELEVATE ln -s base "$target/dependency_libs/xtrans"
 $ELEVATE ln -s base "$target/dependency_libs/xz"
 $ELEVATE ln -s base "$target/dependency_libs/zlib"
 
+find "$target" \( -iname '*.la' -o -iname '*.pc' -o -iname '__pycache__' -o -iname 'link.json' \) | xargs $ELEVATE rm -rf
 
 $ELEVATE "$target/bin/python${long_version}" -m rebuildpython