From 6e9bf5fe6bbd3229dcddb8628b8922aaaf9556db Mon Sep 17 00:00:00 2001 From: Tim S Date: Tue, 14 May 2019 04:36:28 -0400 Subject: [PATCH] gcc-git: Add use of _sourcedir --- mingw-w64-gcc-git/PKGBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mingw-w64-gcc-git/PKGBUILD b/mingw-w64-gcc-git/PKGBUILD index 2a53cd6be1..b1d0137270 100644 --- a/mingw-w64-gcc-git/PKGBUILD +++ b/mingw-w64-gcc-git/PKGBUILD @@ -3,8 +3,10 @@ # Contributor: Alexey Borzenkov # Contributor: Renato Silva # Contributor: Liu Hao +# Contributor: Tim Stahlhut _realname=gcc +_sourcedir=${_realname} pkgbase=mingw-w64-${_realname}-git pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-${_realname}-libs-git" @@ -41,7 +43,7 @@ _branch=gcc-9-branch _realpkgver="$(git archive --remote=git://gcc.gnu.org/git/gcc.git refs/heads/${_branch}:gcc/ BASE-VER | tar -xO)" # git+https://gcc.gnu.org/git/gcc.git#branch=${_branch} -source=("git://gcc.gnu.org/git/gcc.git#branch=${_branch}" +source=(${_sourcedir}::"git://gcc.gnu.org/git/gcc.git#branch=${_branch}" "0002-Relocate-libintl.patch" "0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch" "0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch" @@ -77,12 +79,12 @@ sha256sums=('SKIP' _threads="posix" pkgver() { - cd "$_realname" + cd ${srcdir}/${_sourcedir} printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd ${srcdir}/${_realname} + cd ${srcdir}/${_sourcedir} GIT_AM="git am --committer-date-is-author-date" ${GIT_AM} ${srcdir}/0002-Relocate-libintl.patch ${GIT_AM} ${srcdir}/0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch @@ -134,7 +136,7 @@ build() { ;; esac - ../${_realname}/configure \ + ../${_sourcedir}/configure \ --prefix=${MINGW_PREFIX} \ --with-local-prefix=${MINGW_PREFIX}/local \ --build=${MINGW_CHOST} \ @@ -218,9 +220,9 @@ by LGPL2+. The package as a whole can be redistributed under GPL3+. ENDFILE # License files - install -Dm644 "${srcdir}/${_realname}/COPYING3" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-libs/COPYING3" - install -Dm644 "${srcdir}/${_realname}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-libs/COPYING.LIB" - install -Dm644 "${srcdir}/${_realname}/COPYING.RUNTIME" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-libs/COPYING.RUNTIME" + install -Dm644 "${srcdir}/${_sourcedir}/COPYING3" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-libs/COPYING3" + install -Dm644 "${srcdir}/${_sourcedir}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-libs/COPYING.LIB" + install -Dm644 "${srcdir}/${_sourcedir}/COPYING.RUNTIME" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}-libs/COPYING.RUNTIME" mkdir -p ${pkgdir}${MINGW_PREFIX}/bin