From 1c85a5a8233fc3797076c634b0a9cff76fd11c3f Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 18 Jan 2018 23:03:47 +0000 Subject: [PATCH] libxext: enable x86_gcc2, add debuginfo, move man3 to devel. --- x11-libs/libxext/libxext-1.3.3.recipe | 30 ++++++++++++++++++++------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/x11-libs/libxext/libxext-1.3.3.recipe b/x11-libs/libxext/libxext-1.3.3.recipe index 60b9e70ba..a74667d9a 100644 --- a/x11-libs/libxext/libxext-1.3.3.recipe +++ b/x11-libs/libxext/libxext-1.3.3.recipe @@ -8,17 +8,20 @@ functions to aid authors of client APIs for X protocol extensions." HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" COPYRIGHT="1986, 1987, 1988, 1989, 1994, 1998 The Open Group" LICENSE="MIT (no promotion)" -REVISION="2" +REVISION="3" SOURCE_URI="https://www.x.org/archive/individual/lib/libXext-$portVersion.tar.gz" CHECKSUM_SHA256="eb0b88050491fef4716da4b06a4d92b4fc9e76f880d6310b2157df604342cfe5" SOURCE_DIR="libXext-$portVersion" -ARCHITECTURES="?x86_gcc2 x86 x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="6.4.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libxext$secondaryArchSuffix = $portVersion - lib:libxext$secondaryArchSuffix = 6.4.0 compat >= 6 + lib:libxext$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -27,7 +30,7 @@ REQUIRES=" PROVIDES_devel=" libxext${secondaryArchSuffix}_devel = $portVersion - devel:libxext$secondaryArchSuffix = 6.4.0 compat >= 6 + devel:libxext$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libxext$secondaryArchSuffix == $portVersion base @@ -43,15 +46,18 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" devel:util_macros$secondaryArchSuffix - cmd:autoconf - cmd:libtool cmd:aclocal - cmd:make + cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage libxext$secondaryArchSuffix \ + $libDir/libXext.so.$libVersion + BUILD() { libtoolize --force --copy --install @@ -65,10 +71,18 @@ INSTALL() rm -rf $libDir/libXext.la + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $documentationDir + maybe_manDir_man3= + else + maybe_manDir_man3=$manDir/man3 + fi + fixPkgconfig prepareInstalledDevelLib libXext # devel package packageEntries devel \ - $developDir + $developDir \ + $maybe_manDir_man3 }