summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-02-27 00:12:58 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-02-27 00:12:58 +0000
commit5151e6439f7d47738540c08557572511045cfa6e (patch)
treee80ae8a9e27811e1d917e9a66aa2c62d914091e7
parent0f638e77c60f34d1036c65207c44d3960004d124 (diff)
parentf5f65709c453a19c312f4803e3bbf5c1db867d27 (diff)
downloadpackages-5151e6439f7d47738540c08557572511045cfa6e.tar.gz
packages-5151e6439f7d47738540c08557572511045cfa6e.tar.bz2
packages-5151e6439f7d47738540c08557572511045cfa6e.tar.xz
packages-5151e6439f7d47738540c08557572511045cfa6e.zip
Merge branch 'gcc-https' into 'master'
system/gcc: Use https:// for source URLs See merge request !188
-rw-r--r--system/gcc/APKBUILD9
1 files changed, 5 insertions, 4 deletions
diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD
index 0c97d5ef5..7da594e20 100644
--- a/system/gcc/APKBUILD
+++ b/system/gcc/APKBUILD
@@ -1,6 +1,7 @@
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
pkgname=gcc
pkgver=6.4.0
+_ecjver=4.9
[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
@@ -8,7 +9,7 @@ pkgver=6.4.0
pkgname="$pkgname$_target"
pkgrel=10
pkgdesc="The GNU Compiler Collection"
-url="http://gcc.gnu.org"
+url="https://gcc.gnu.org"
arch="all"
license="GPL-3.0+ AND LGPL-2.1+"
_gccrel=$pkgver-r$pkgrel
@@ -142,8 +143,8 @@ if $LANG_ADA; then
fi
makedepends="$makedepends_build $makedepends_host"
-source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
- ftp://sourceware.org/pub/java/ecj-4.9.jar
+source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
+ https://sourceware.org/pub/java/ecj-$_ecjver.jar
001_all_default-ssp-strong.patch
002_all_default-relro.patch
@@ -195,7 +196,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgba
"
# we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
+_gccdir="$srcdir"/gcc-$pkgver
_gcclibdir=/usr/lib/gcc/${CTARGET}/$pkgver
_gcclibexec=/usr/libexec/gcc/${CTARGET}/$pkgver