Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=04a1467c350e2ee82744d096d674aacb18950483
commit 04a1467c350e2ee82744d096d674aacb18950483 Author: crazy <cr...@frugalware.org> Date: Mon Feb 12 17:02:06 2018 +0100 opencollada-22.git69b844d-5-x86_64 * rebuild with tc * fixup FB a bit , use Fexec where possible added missing Fdie's , added fixme for cmake part diff --git a/source/xoffice/opencollada/FrugalBuild b/source/xoffice/opencollada/FrugalBuild index 6ab5063..5f9f41b 100644 --- a/source/xoffice/opencollada/FrugalBuild +++ b/source/xoffice/opencollada/FrugalBuild @@ -6,7 +6,7 @@ commit=69b844dc9eea0a014326149c259e7810ecec4c8c shortcommit=${commit:0:7} pkgver=22.git$shortcommit sover=0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Collada 3D import and export libraries" url="https://collada.org/mediawiki/index.php/OpenCOLLADA" depends=('libxml2' 'pcre' 'xz') @@ -34,13 +34,13 @@ build() # Add some docs, need to fix eol encoding with dos2unix in some files. find ./ -name .project -delete - cp -pf COLLADAStreamWriter/README README.COLLADAStreamWriter - cp -pf COLLADAStreamWriter/LICENSE ./ + Fexec cp -pf COLLADAStreamWriter/README README.COLLADAStreamWriter + Fexec cp -pf COLLADAStreamWriter/LICENSE ./ iconv -f ISO_8859-1 -t utf-8 COLLADAStreamWriter/AUTHORS > \ COLLADAStreamWriter/AUTHORS.tmp - touch -r COLLADAStreamWriter/AUTHORS COLLADAStreamWriter/AUTHORS.tmp - mv COLLADAStreamWriter/AUTHORS.tmp COLLADAStreamWriter/AUTHORS + Fexec touch -r COLLADAStreamWriter/AUTHORS COLLADAStreamWriter/AUTHORS.tmp + Fexec mv COLLADAStreamWriter/AUTHORS.tmp COLLADAStreamWriter/AUTHORS dos2unix -f README.COLLADAStreamWriter dos2unix -f LICENSE @@ -48,7 +48,7 @@ build() find htdocs/ -name *.php -exec dos2unix -f {} \; find htdocs/ -name *.css -exec dos2unix -f {} \; - # Build. + # Build. FIXME rm -rf Build && mkdir -p Build && pushd Build cmake -DUSE_STATIC=OFF \ -DUSE_SHARED=ON \ @@ -59,9 +59,9 @@ build() -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ ../ - make + Fexec make || Fdie - make DESTDIR=$Fdestdir install + Fexec make DESTDIR=$Fdestdir install || Fdie # Manually install binary Fmkdir /usr/bin _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git