im: allow hybrid builds and other cleanups

* Fix tecmake to set a soname for the libraries

This currenly fails strict-policy checks because the package doesn't
depend on libstdc++.so, but this should be in haiku$secondaryArchSuffix.
I also had to explicitly depend on the proper version of as, otherwise
the one for gcc2 would be picked up. I suspect one of the dependencies
is wrong, but attempts to use haikuporter --why have failed.
This commit is contained in:
Adrien Destugues
2013-11-16 21:51:21 +01:00
parent 62984b532f
commit ac009bccc0
2 changed files with 29 additions and 15 deletions

View File

@@ -4,6 +4,7 @@ SRC_URI="http://freefr.dl.sourceforge.net/project/imtoolkit/3.8.1/Docs%20and%20S
CHECKSUM_MD5="7cb22f5a145463fc943198faf31c76f1"
REVISION="1"
ARCHITECTURES="x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
im$secondaryArchSuffix = $portVersion
lib:libim$secondaryArchSuffix = $portVersion
@@ -24,17 +25,20 @@ PROVIDES="
lib:libimlua_process52$secondaryArchSuffix = $portVersion
lib:libimlua_process_omp52$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
lib:libz
"
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku_devel$secondaryArchSuffix >= $haikuVersion
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:make
cmd:gcc$secondaryArchSuffix
cmd:as$secondaryArchSuffix
cmd:which
devel:liblua
devel:liblua$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
SOURCE_DIR="im"
@@ -52,15 +56,13 @@ INSTALL()
mkdir -p $includeDir
rm lib/Haiku11/libz.*
cp lib/Haiku11/*.so $libDir
cp lib/Haiku11/*.a $developLibDir
cp lib/Haiku11/* $libDir
cp include/* $includeDir
# Won't work, the libs have no soname...
# prepareInstalledDevelLib libim
# libim libim_fftw libim_jp2 libim_process libim_process_omp \
# libimlua51 libimlua_fftw51 libimlua_jp251 libimlua_process51 libimlua_process_omp51 \
# libimlua52 libimlua_fftw52 libimlua_jp252 libimlua_process52 libimlua_process_omp52
prepareInstalledDevelLibs libim libim_fftw libim_jp2 libim_process \
libim_process_omp libimlua51 libimlua_fftw51 libimlua_jp251 \
libimlua_process51 libimlua_process_omp51 libimlua52 libimlua_fftw52 \
libimlua_jp252 libimlua_process52 libimlua_process_omp52
packageEntries devel $developDir
}