Index: Makefile
===================================================================
--- Makefile (.../1.1.34-ppc32) (revision 451)
+++ Makefile (.../1.1.42-ppc32) (revision 452)
@@ -15,7 +15,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-ppc32
REQUIRES += net/libgcrypt/1.11.0-ppc32
@@ -22,7 +22,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)
@@ -43,7 +43,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)
@@ -101,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_PPC32_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_PPC32_SUFFIX)/python$(PYTHON_VERSION)/site-packages
+python_environment += am_cv_python_pyexecdir=/usr/lib$(MULTILIB_PPC32_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_PPC32_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_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX)
TARGET_LIB_RPATH = /lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX):/usr/lib/../lib$(MULTILIB_PPC32_SUFFIX)
@@ -135,7 +127,6 @@
$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
$(UNPACK_SRC_ARCHIVE)
$(APPLY_PATCHES)
- @( cd $(SRC_DIR) ; autoreconf -vif )
@touch $@
$(build_target): $(src_done)
@@ -168,7 +159,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_PPC32_SUFFIX),g" xslt-config ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(LIBXSLT_32_PKG))
Index: PATCHES
===================================================================
--- PATCHES (.../1.1.34-ppc32) (revision 451)
+++ PATCHES (.../1.1.42-ppc32) (revision 452)
@@ -1,2 +0,0 @@
-
-../../../sources/packages/l/libxslt/patches/libxslt-1.1.34-python.patch -p0