fixup! libXcb, bump revision, use correct REQUIRES_devel

This commit is contained in:
begasus
2018-08-13 14:30:37 +02:00
committed by waddlesplash
parent e90ff62cf7
commit 11188bac43

View File

@@ -85,6 +85,7 @@ PROVIDES="
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
lib:libcheck$secondaryArchSuffix
lib:libXau$secondaryArchSuffix lib:libXau$secondaryArchSuffix
lib:libXdmcp$secondaryArchSuffix lib:libXdmcp$secondaryArchSuffix
" "
@@ -126,6 +127,7 @@ REQUIRES_devel="
BUILD_REQUIRES=" BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel haiku${secondaryArchSuffix}_devel
devel:libcheck$secondaryArchSuffix
devel:libpthread_stubs devel:libpthread_stubs
devel:libXau$secondaryArchSuffix devel:libXau$secondaryArchSuffix
devel:libXdmcp$secondaryArchSuffix devel:libXdmcp$secondaryArchSuffix
@@ -136,12 +138,14 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
cmd:aclocal cmd:aclocal
cmd:autoconf cmd:autoconf
#cmd:doxygen # cmd:dot$secondaryArchSuffix
# cmd:doxygen
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix
cmd:make cmd:make
cmd:pkg_config$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix
cmd:python cmd:python
cmd:xsltproc
" "
debugList=( debugList=(
@@ -159,15 +163,16 @@ defineDebugInfoPackage libxcb$secondaryArchSuffix "${debugList[@]}"
BUILD() BUILD()
{ {
autoreconf -vfi autoreconf -vfi
runConfigure ./configure runConfigure --omit-dirs docDir ./configure --docdir=$developDocDir
# doxygen -u doc/xcb.doxygen
make $jobArgs make $jobArgs
} }
INSTALL() INSTALL()
{ {
make install make install
install -d -m 755 "$docDir" install -d -m 755 "$developDocDir"
install -m 644 -t "$docDir" README install -m 644 -t "$developDocDir" README
# remove libtool library files # remove libtool library files
rm $libDir/libxcb*.la rm $libDir/libxcb*.la
@@ -176,12 +181,19 @@ INSTALL()
fixPkgconfig fixPkgconfig
if [ -n "$secondaryArchSuffix" ]; then if [ -n "$secondaryArchSuffix" ]; then
rm -rf $documentationDir/man rm -rf $manDir
maybe_manDir_man3=
else
maybe_manDir_man3=$manDir/man3
fi fi
# devel package # devel package
packageEntries devel \ packageEntries devel \
$developDir $developDir \
$maybe_manDir_man3
# remove the empty $documentationDir on primary architecture
rm -fr $documentationDir
} }
TEST() TEST()