diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-02-15 16:42:49 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-02-15 16:42:49 +0000 |
| commit | 45a04670ae2f6b4a0857bd78f922d47cfac57f0b (patch) | |
| tree | 9e899801f2f8edef1def85acd2109c4bdcffb541 /ports-mgmt/poudriere | |
| parent | 348f67dbcfe648514a49441fe37f7d7b8a3058c7 (diff) | |
| download | ports-45a04670ae2f6b4a0857bd78f922d47cfac57f0b.tar.gz ports-45a04670ae2f6b4a0857bd78f922d47cfac57f0b.zip | |
Notes
Diffstat (limited to 'ports-mgmt/poudriere')
| -rw-r--r-- | ports-mgmt/poudriere/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/files/patch-arm64-binutils | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 909f199b42d0..074b17fc68d6 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.1.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere/files/patch-arm64-binutils b/ports-mgmt/poudriere/files/patch-arm64-binutils new file mode 100644 index 000000000000..8efaf84cbcb9 --- /dev/null +++ b/ports-mgmt/poudriere/files/patch-arm64-binutils @@ -0,0 +1,29 @@ +commit f61894880dc863258d8ef76fb1bde993b6b9ca08 +Author: Bryan Drewery <bryan@shatow.net> +Date: Fri Aug 26 14:23:39 2016 -0700 + + For arm64 copy the latest aarch64-binutils ld into the jail at startup. + + This will work like the qemu installation done at startup, and not require + messing with the jail creation/update or snapshots. + +diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh +index 7c1a4d7..4244b0f 100755 +--- src/share/poudriere/common.sh ++++ src/share/poudriere/common.sh +@@ -1777,6 +1777,15 @@ jail_start() { + mkdir -p "${tomnt}${EMULATOR%/*}" + cp -f "${EMULATOR}" "${tomnt}${EMULATOR}" + fi ++ # Handle special ARM64 needs ++ if [ "${arch#*.}" = "aarch64" ] && ! [ -f "${tomnt}/usr/bin/ld" ]; then ++ if [ -f /usr/local/aarch64-freebsd/bin/ld ]; then ++ cp -f /usr/local/aarch64-freebsd/bin/ld \ ++ "${tomnt}/usr/bin/ld" ++ else ++ err 1 "Arm64 requires aarch64-binutils to be installed." ++ fi ++ fi + + if [ -d "${CCACHE_DIR:-/nonexistent}" ]; then + cat >> "${tomnt}/etc/make.conf" <<-EOF |