Radix cross Linux

Index: Makefile
===================================================================
--- Makefile	(.../1.1.34-x86_32/Makefile)	(revision 451)
+++ Makefile	(.../1.1.42-x86_32/Makefile)	(revision 452)
@@ -12,7 +12,7 @@
 
 SOURCE_REQUIRES    = sources/packages/l/libxslt
 
-REQUIRES           = libs/libxslt/1.1.34
+REQUIRES           = libs/libxslt/1.1.42
 REQUIRES          += libs/libxml2/2.13.6-x86_32
 REQUIRES          += net/libgcrypt/1.11.0-x86_32
 
@@ -19,7 +19,7 @@
 # ======= __END_OF_REQUIRES__ =======
 
 
-version            = 1.1.34
+version            = 1.1.42
 tar_xz_archive     = $(SRC_PACKAGE_PATH)/packages/l/libxslt/libxslt-$(version).tar.xz
 SRC_ARCHIVE        = $(tar_xz_archive)
 SRC_DIR            = $(TARGET_BUILD_DIR)/libxslt-$(version)
@@ -40,7 +40,7 @@
 # *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
 #
 LIBXSLT_32_PKG_NAME                = libxslt-x32
-LIBXSLT_32_PKG_VERSION             = 1.1.34
+LIBXSLT_32_PKG_VERSION             = 1.1.42
 LIBXSLT_32_PKG_ARCH                = $(PKGARCH)
 LIBXSLT_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
 LIBXSLT_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
@@ -90,6 +90,9 @@
 extra_configure_switches += --bindir=/usr/bin/32
 
 extra_configure_switches += --disable-dependency-tracking
+
+extra_configure_switches += --with-python
+
 ifeq ($(__ENABLE_STATIC__),yes)
 extra_configure_switches += --enable-static=yes
 else
@@ -98,31 +101,23 @@
 extra_configure_switches += --enable-shared=yes
 
 
-PYTHON_VERSION = 2.7
+PYTHON_VERSION = 3.12
 
-ifeq ($(PYTHON_VERSION),2.7)
-WITH_PYTHON = $(PYTHON2)
 python_environment  = PYTHON_VERSION=$(PYTHON_VERSION)
-python_environment += PYTHON_SITE_PACKAGES=/usr/lib$(MULTILIB_X86_32_SUFFIX)/python$(PYTHON_VERSION)/site-packages
-python_environment += PYTHON_INCLUDES=$(TARGET_DEST_DIR)/usr/include/python$(PYTHON_VERSION)
+python_environment += ac_cv_path_PYTHON=$(PYTHON3)
+python_environment += am_cv_python_pythondir=/usr/lib$(MULTILIB_X86_32_SUFFIX)/python$(PYTHON_VERSION)/site-packages
+python_environment += am_cv_python_pyexecdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)/python$(PYTHON_VERSION)/site-packages
+python_environment += PYTHON_CFLAGS='$(shell $(TARGET_DEST_DIR)/usr/bin/32/python$(PYTHON_VERSION)-config --includes)'
 python_environment += PYTHON_LIBS='$(shell $(TARGET_DEST_DIR)/usr/bin/32/python$(PYTHON_VERSION)-config --ldflags)'
-CFLAGS += -I$(TARGET_DEST_DIR)/usr/include/python$(PYTHON_VERSION)
-endif
 
-ifeq ($(PYTHON_VERSION),3.12)
-WITH_PYTHON = $(PYTHON3)
-python_environment  = PYTHON_VERSION=$(PYTHON_VERSION)
-python_environment += PYTHON_SITE_PACKAGES=/usr/lib$(MULTILIB_X86_32_SUFFIX)/python$(PYTHON_VERSION)/site-packages
-python_environment += PYTHON_INCLUDES='$(shell $(TARGET_DEST_DIR)/usr/bin/python$(PYTHON_VERSION)-config --includes)'
-python_environment += PYTHON_LIBS='$(shell $(TARGET_DEST_DIR)/usr/bin/32/python$(PYTHON_VERSION)-config --ldflags)'
-CFLAGS += -I$(TARGET_DEST_DIR)/usr/include/python$(PYTHON_VERSION)
-endif
 
-
 libs_config  = LIBGCRYPT_CONFIG=$(TARGET_DEST_DIR)/usr/bin/32/libgcrypt-config
 libs_config += XML_CONFIG=$(TARGET_DEST_DIR)/usr/bin/32/xml2-config
 
 
+CFLAGS += -I$(TARGET_DEST_DIR)/usr/include/python$(PYTHON_VERSION)
+
+
 TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
 TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
 
@@ -132,16 +127,14 @@
 $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
 	$(UNPACK_SRC_ARCHIVE)
 	$(APPLY_PATCHES)
-	@( cd $(SRC_DIR) ; autoreconf -vif )
 	@touch $@
 
 $(build_target): $(src_done)
 	@mkdir -p $(build_dir)
 	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(python_environment) $(libs_config) ../$(src_dir_name)/configure \
-	  --prefix=/usr                \
-	  --build=$(BUILD)             \
-	  --host=$(TARGET32)           \
-	  --with-python=$(WITH_PYTHON) \
+	  --prefix=/usr       \
+	  --build=$(BUILD)    \
+	  --host=$(TARGET32)  \
 	  $(extra_configure_switches)
 	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) $(python_environment)
 	@touch $@
@@ -165,7 +158,8 @@
 	 )
 	# ======= tune xslt-config script for runtime =======
 	@( cd $(LIBXSLT_32_PKG)/usr/bin/32 ; \
-	   sed -i "s,$(TARGET_DEST_DIR),,g" xslt-config ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g"                                xslt-config ; \
+	   sed -i "s,prefix}/lib$$,prefix}/lib$(MULTILIB_X86_32_SUFFIX),g" xslt-config ; \
 	 )
 	# ======= Install the same to $(TARGET_DEST_DIR) =======
 	$(call install-into-devenv, $(LIBXSLT_32_PKG))