bullet: fix build for secondary arch

sci-physics/bullet/bullet-2.87.recipe

@@ -7,13 +7,13 @@ the ZLib license."
 HOMEPAGE="http://www.bulletphysics.com/"
 COPYRIGHT="2003-2017 Erwin Coumans and the Bullet Physics Library Team"
 LICENSE="Zlib"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/bulletphysics/bullet3/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="438c151c48840fe3f902ec260d9496f8beb26dba4b17769a4a53212903935f95"
 SOURCE_DIR="bullet3-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
@@ -99,12 +99,11 @@ BUILD()
 		-DBUILD_BULLET2_DEMOS=OFF \
 		-DBUILD_EXTRAS=OFF \
 		-DBUILD_UNIT_TESTS=OFF \
-		-DCMAKE_INSTALL_PREFIX=$prefix \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DINSTALL_LIBS=ON \
-		-DLIB_DESTINATION:PATH="$libDir" \
-		-DINCLUDE_INSTALL_DIR:PATH="$includeDir/bullet/"
-
+		-DLIB_SUFFIX="/$effectiveTargetArchitecture" \
+		-DINCLUDE_INSTALL_DIR="$includeDir/bullet/" \
+		$cmakeDirArgs
 	make $jobArgs
 }
 
@@ -129,6 +128,8 @@ INSTALL()
 
 	fixPkgconfig
 
+	sed -i "s|Cflags:.*|Cflags: -I$includeDir/bullet|" $developLibDir/pkgconfig/bullet.pc
+
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake