diff options
| author | tijl <tijl@FreeBSD.org> | 2016-08-01 21:07:14 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2016-08-01 21:07:14 +0800 |
| commit | e7fcfeda2ad06d6f5a4617562b56b8dd2e72ece5 (patch) | |
| tree | e19f77eddb45b9da4061e0b011dfe765f76dda2b /Mk | |
| parent | 56f835f6fb4468f2d097949ebf2bb29a87022b8b (diff) | |
| download | freebsd-ports-gnome-e7fcfeda2ad06d6f5a4617562b56b8dd2e72ece5.tar.gz freebsd-ports-gnome-e7fcfeda2ad06d6f5a4617562b56b8dd2e72ece5.tar.zst freebsd-ports-gnome-e7fcfeda2ad06d6f5a4617562b56b8dd2e72ece5.zip | |
Use LINUX_REPO_ARCH instead of LINUX_RPM_ARCH when setting DISTINFO_FILE
and PLIST for Linux ports. LINUX_RPM_ARCH is the CPU targetted by a
package and LINUX_REPO_ARCH is like our ARCH which is more suitable. This
only affects Centos 6 ports because they are the only ones where
LINUX_REPO_ARCH != LINUX_RPM_ARCH.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.linux-rpm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk index 70fdd0841d56..2a9d996630ac 100644 --- a/Mk/bsd.linux-rpm.mk +++ b/Mk/bsd.linux-rpm.mk @@ -156,7 +156,7 @@ EXTRACT_BEFORE_ARGS?= < EXTRACT_AFTER_ARGS?= | ${TAR} xf - --no-same-permissions --no-same-owner .endif -DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_REPO_ARCH} BRANDELF_DIRS?= BRANDELF_FILES?= @@ -176,7 +176,7 @@ linux-rpm-clean-portdocs: . endif . if ${USE_LINUX} != "f10" -PLIST?= ${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH} +PLIST?= ${MASTERDIR}/pkg-plist.${LINUX_REPO_ARCH} . endif . if defined(AUTOMATIC_PLIST) |