summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-10-10 15:09:40 +0200
committerErich Eckner <git@eckner.net>2018-10-10 15:09:40 +0200
commit6e56e8f4a51a4bdd38d638ddff9c772a7a7d5192 (patch)
treee0efda42c31023f04d0866f31e6844cbf8e5858f
parent8f7fdd53c7238e6b8498cbad423cc68ebf5b0a57 (diff)
downloadarchlinuxewe-6e56e8f4a51a4bdd38d638ddff9c772a7a7d5192.tar.xz
fpc-cross: actually install _cross_ tools
-rw-r--r--fpc-cross/PKGBUILD13
1 files changed, 6 insertions, 7 deletions
diff --git a/fpc-cross/PKGBUILD b/fpc-cross/PKGBUILD
index 919ed27c6..07fa5868b 100644
--- a/fpc-cross/PKGBUILD
+++ b/fpc-cross/PKGBUILD
@@ -11,6 +11,7 @@ pkgbase=fpc-cross
pkgname=(fpc-cross-common fpc-win32 fpc-win64)
pkgver=3.0.4
pkgrel=1
+pkgdesc='Free Pascal Compiler, Turbo Pascal 7.0 and Delphi compatible - cross compiler'
arch=('i686' 'x86_64')
url="http://www.freepascal.org/"
license=('GPL' 'LGPL' 'custom')
@@ -39,11 +40,9 @@ build() {
mkdir "$srcdir/pkg-${architecture%:*}"
export HOME="$srcdir"
- make -j1 PREFIX="$srcdir/pkg-${architecture%:*}/usr" install NOGDB=1
+ make -j1 PREFIX="$srcdir/pkg-${architecture%:*}/usr" crossinstall NOGDB=1
- export PATH="$srcdir/pkg-${architecture%:*}/usr/bin:$PATH"
-
- install -Dm0644 fpcsrc/rtl/COPYING.FPC "$srcdir/pkg-${architecture%:*}/usr/share/licenses/${pkgname}/COPYING.FPC"
+ install -Dm0644 fpcsrc/rtl/COPYING.FPC "$srcdir/pkg-${architecture%:*}/usr/share/licenses/fpc-${architecture%:*}/COPYING.FPC"
find "$srcdir/pkg-${architecture%:*}" -name '*.exe' -delete
{
@@ -64,7 +63,7 @@ build() {
) || exit $?
done
ln -s "/usr/lib/fpc/${pkgver}/ppcrossx64" "$srcdir/pkg-win64/usr/bin/"
- ln -s "/usr/lib/fpc/${pkgver}/ppcrossx32" "$srcdir/pkg-win32/usr/bin/"
+ ln -s "/usr/lib/fpc/${pkgver}/ppcross386" "$srcdir/pkg-win32/usr/bin/"
mkdir "$srcdir/pkg-common"
{
cd "$srcdir/pkg-win64"
@@ -87,7 +86,7 @@ build() {
}
_package() {
- pkgdesc="Free Pascal Compiler, Turbo Pascal 7.0 and Delphi compatible - cross compiler for $1 target."
+ pkgdesc+=" for $1 target."
depends+=("fpc-cross-common=${pkgver}")
mv "$srcdir/pkg-$1/"* "$pkgdir/"
@@ -95,7 +94,7 @@ _package() {
package_fpc-cross-common() {
arch=('any')
- pkgdesc="Common files for fpc-win32 and fpc-win64 cross compilers."
+ pkgdesc+=' common files.'
mv "$srcdir/pkg-common/"* "$pkgdir/"
}