mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
proj: fix minor issue in recipe for 4.8.0 and add 4.9.2.
* Fix test for setting commandSuffix and commandBinDir on x86_gcc2. * Install runtimes in bin instead of bin/x86/ for x86 2nd arch. * Drop unneeded "chmod +x ./configure" in BUILD(). Off topic: I would like to apologize for the duplicate commit log 3 commits earlier: "Update DriveEncryption homepage to upstream repo" for haiku-apps/drive_encryption/drive_encryption-1.0.recipe. I'm the only person to blame for this mistake. Sorry for the noise.
This commit is contained in:
@@ -2,9 +2,9 @@ SUMMARY="A cartographic projection software"
|
||||
DESCRIPTION="Proj.4 is a library for performing conversions between \
|
||||
cartographic projections."
|
||||
HOMEPAGE="http://trac.osgeo.org/proj/"
|
||||
COPYRIGHT="2000, Frank Warmerdam"
|
||||
COPYRIGHT="2000-2012 Frank Warmerdam"
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/OSGeo/proj.4/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="49635259993aa3ed7d06ae39ed12fac250401e7fc2d1c459d86e28400abbeb44"
|
||||
SOURCE_DIR="proj.4-$portVersion"
|
||||
@@ -12,7 +12,10 @@ SOURCE_DIR="proj.4-$portVersion"
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
if [ $targetArchitecture != x86_gcc2 ]; then
|
||||
if [ "$targetArchitecture" != x86_gcc2 ]; then
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
commandBinDir=$binDir
|
||||
else
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
@@ -20,12 +23,12 @@ fi
|
||||
PROVIDES="
|
||||
proj$secondaryArchSuffix = $portVersion compat >= 4
|
||||
lib:libproj$secondaryArchSuffix = 0.7.0 compat >= 0.7
|
||||
cmd:cs2cs$secondaryArchSuffix
|
||||
cmd:geod$secondaryArchSuffix
|
||||
cmd:invgeod$secondaryArchSuffix
|
||||
cmd:invproj$secondaryArchSuffix
|
||||
cmd:nad2bin$secondaryArchSuffix
|
||||
cmd:proj$secondaryArchSuffix
|
||||
cmd:cs2cs$commandSuffix
|
||||
cmd:geod$commandSuffix
|
||||
cmd:invgeod$commandSuffix
|
||||
cmd:invproj$commandSuffix
|
||||
cmd:nad2bin$commandSuffix
|
||||
cmd:proj$commandSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -51,8 +54,7 @@ BUILD_PREREQUIRES="
|
||||
|
||||
BUILD()
|
||||
{
|
||||
chmod +x ./configure
|
||||
runConfigure ./configure
|
||||
runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user