diff --git a/dev-libs/libxslt/libxslt-1.1.34.recipe b/dev-libs/libxslt/libxslt-1.1.39.recipe similarity index 56% rename from dev-libs/libxslt/libxslt-1.1.34.recipe rename to dev-libs/libxslt/libxslt-1.1.39.recipe index c11c01f89..37518bf82 100644 --- a/dev-libs/libxslt/libxslt-1.1.34.recipe +++ b/dev-libs/libxslt/libxslt-1.1.39.recipe @@ -8,18 +8,16 @@ in commercial applications." HOMEPAGE="http://www.xmlsoft.org/" COPYRIGHT="2001-2012 Daniel Veillard" LICENSE="MIT" -REVISION="4" -SOURCE_URI="ftp://xmlsoft.org/libxml2/libxslt-$portVersion.tar.gz" -CHECKSUM_SHA256="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f" +REVISION="1" +SOURCE_URI="https://download.gnome.org/sources/libxslt/1.1/libxslt-$portVersion.tar.xz" +CHECKSUM_SHA256="2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libxslt$secondaryArchSuffix = $portVersion - cmd:xslt_config$secondaryArchSuffix = $portVersion - cmd:xsltproc$secondaryArchSuffix = $portVersion - lib:libexslt$secondaryArchSuffix = 0.8.20 compat >= 0 + lib:libexslt$secondaryArchSuffix = 0.8.21 compat >= 0 lib:libxslt$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES=" @@ -28,9 +26,28 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +PROVIDES_tools=" + libxslt${secondaryArchSuffix}_tools = $portVersion + cmd:xsltproc$secondaryArchSuffix = $portVersion + " +REQUIRES_tools=" + $REQUIRES + libxslt$secondaryArchSuffix == $portVersion + " + +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + PROVIDES_python310=" + libxslt${secondaryArchSuffix}_python310 = $portVersion + " + REQUIRES_python310=" + libxslt$secondaryArchSuffix == $portVersion + " +fi + PROVIDES_devel=" libxslt${secondaryArchSuffix}_devel = $portVersion - devel:libexslt$secondaryArchSuffix = 0.8.20 compat >= 0 + cmd:xslt_config$secondaryArchSuffix = $portVersion + devel:libexslt$secondaryArchSuffix = 0.8.21 compat >= 0 devel:libxslt$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES_devel=" @@ -54,6 +71,11 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix cmd:sed " +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + BUILD_PREREQUIRES+=" + cmd:python3 + " +fi PATCH() { @@ -66,8 +88,13 @@ PATCH() BUILD() { + if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then + pythonArg="--without-python" + else + pythonArg="--with-python" + fi autoreconf -fi - runConfigure ./configure + runConfigure ./configure $pythonArg make $jobArgs } @@ -75,16 +102,33 @@ INSTALL() { make install - rm $libDir/libexslt.la $libDir/libxslt.la \ - $libDir/libexslt.a $libDir/libxslt.a + rm $libDir/libexslt.la $libDir/libxslt.la + +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + $prefix/lib/python3.10/vendor-packages/libxsltmod.la +fi prepareInstalledDevelLibs \ libxslt \ libexslt fixPkgconfig + packageEntries tools \ + $binDir/xsltproc \ + $manDir/man1 + +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + packageEntries python310 \ + $prefix/lib/python3.10 +fi + packageEntries devel \ - $developDir + $binDir \ + $dataDir \ + $developDir \ + $documentationDir \ + $libDir/cmake \ + $libDir/xsltConf.sh } TEST()