diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 08:22:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 08:22:13 +0200 |
| commit | 97348d0f106a154f2ca5f1dd5298216ca120aa2d (patch) | |
| tree | d57f6a3dcc69d1c35b5c1dc9ddfee296bd3a14aa | |
| parent | 65d58a1827c68aac8079ab98050f35b17d14b821 (diff) | |
| parent | 8867d876ad1bf8ef09fb1f21f5dd868d938f752c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/buildhlp.mk | 4 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.8.2/miscompile.sparc (renamed from toolchain/gcc/patches/4.8.2/sparc-miscompile.patch) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 5ce3ca4a0..c8acd2ae6 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -72,9 +72,9 @@ ifeq ($(strip ${__use_generic_patch_target}),42) post-patch: ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done [ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches/${PKG_VERSION} \ - '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) + '{patch-!(*.orig),*.patch,*.${ARCH}}' $(MAKE_TRACE) [ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ - '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) + '{patch-!(*.orig),*.patch,*.${ARCH}}' $(MAKE_TRACE) [ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \ $(MAKE_TRACE) @${MAKE} post-patch $(MAKE_TRACE) diff --git a/toolchain/gcc/patches/4.8.2/sparc-miscompile.patch b/toolchain/gcc/patches/4.8.2/miscompile.sparc index 4aef2e605..4aef2e605 100644 --- a/toolchain/gcc/patches/4.8.2/sparc-miscompile.patch +++ b/toolchain/gcc/patches/4.8.2/miscompile.sparc |