core138: insert emergency core update for new intel vulnarabilities.

[ipfire-2.x.git] / lfs / python3

diff --git a/lfs/python3 b/lfs/python3
index debb428a59fa411836130a2f4ddb1cfe107d2f06..1767afddf056b6d83f9fec75cf7e94f973f87136 100644 (file)
--- a/lfs/python3
+++ b/lfs/python3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,10 +32,27 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = ""
 
+# Normal build or $(TOOLS_DIR) build.
+#
+ifeq "$(ROOT)" ""
+  TARGET = $(DIR_INFO)/$(THISAPP)
+  CONFIGURE_ARGS = \
+       --prefix=/usr \
+       --enable-shared \
+       --with-system-expat \
+       --with-system-ffi \
+       --with-ensurepip
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  CONFIGURE_ARGS = \
+       --prefix=$(TOOLS_DIR) \
+       --without-ensurepip
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -77,12 +94,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+
+ifeq "$(ROOT)" ""
        rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
-       cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-               --prefix=/usr \
-               --enable-shared \
-               --with-system-ffi
+else
+       cd $(DIR_APP) && sed -i '/def add_multiarch_paths/a \        return' setup.py
+endif
 
+       cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure $(CONFIGURE_ARGS)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)