diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 18:35:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-26 18:35:04 +0100 |
| commit | 0fb48650251a62376365ebfacd7b7d8b89740a6b (patch) | |
| tree | ebfcc748cd658e9376b6debf693e14ae57ad3e37 /toolchain | |
| parent | 181e796c9beb08534f9e3f50c881bb8feaf78c5c (diff) | |
| parent | 9b69269c78ddc3411482c6ecac91bb9c7faff996 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.4.82/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.4.71/aufs2.patch) | 0 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.4.82/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.4.71/linux-gcc-check.patch) | 0 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.4.82/microperl.patch (renamed from toolchain/kernel-headers/patches/3.4.71/microperl.patch) | 0 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.4.82/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.4.71/mkpiggy.patch) | 0 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.4.82/relocs.patch (renamed from toolchain/kernel-headers/patches/3.4.71/relocs.patch) | 0 |
6 files changed, 4 insertions, 2 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 5c81f9fd2..2cd720a63 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -206,10 +206,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled # fix linking g++ apps with libtool @-test -d $(STAGING_TARGET_DIR)/lib32 && \ cd $(STAGING_TARGET_DIR)/lib32 && \ - ln -sf libstdc++.so.6.0.17 libstdc++.so + ln -sf libstdc++.so.6.0.17 libstdc++.so && \ + ln -sf libstdc++.so.6.0.17 libstdc++.so.6 @-test -d $(STAGING_TARGET_DIR)/lib64 && \ cd $(STAGING_TARGET_DIR)/lib64 && \ - ln -sf libstdc++.so.6.0.17 libstdc++.so + ln -sf libstdc++.so.6.0.17 libstdc++.so && \ + ln -sf libstdc++.so.6.0.17 libstdc++.so.6 # cleanup unneeded docs rm -rf $(STAGING_HOST_DIR)/share touch $@ diff --git a/toolchain/kernel-headers/patches/3.4.71/aufs2.patch b/toolchain/kernel-headers/patches/3.4.82/aufs2.patch index d40c9a3fe..d40c9a3fe 100644 --- a/toolchain/kernel-headers/patches/3.4.71/aufs2.patch +++ b/toolchain/kernel-headers/patches/3.4.82/aufs2.patch diff --git a/toolchain/kernel-headers/patches/3.4.71/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.82/linux-gcc-check.patch index 7cc381845..7cc381845 100644 --- a/toolchain/kernel-headers/patches/3.4.71/linux-gcc-check.patch +++ b/toolchain/kernel-headers/patches/3.4.82/linux-gcc-check.patch diff --git a/toolchain/kernel-headers/patches/3.4.71/microperl.patch b/toolchain/kernel-headers/patches/3.4.82/microperl.patch index 44c39f6e8..44c39f6e8 100644 --- a/toolchain/kernel-headers/patches/3.4.71/microperl.patch +++ b/toolchain/kernel-headers/patches/3.4.82/microperl.patch diff --git a/toolchain/kernel-headers/patches/3.4.71/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.82/mkpiggy.patch index d4e815cd2..d4e815cd2 100644 --- a/toolchain/kernel-headers/patches/3.4.71/mkpiggy.patch +++ b/toolchain/kernel-headers/patches/3.4.82/mkpiggy.patch diff --git a/toolchain/kernel-headers/patches/3.4.71/relocs.patch b/toolchain/kernel-headers/patches/3.4.82/relocs.patch index 43c5bb580..43c5bb580 100644 --- a/toolchain/kernel-headers/patches/3.4.71/relocs.patch +++ b/toolchain/kernel-headers/patches/3.4.82/relocs.patch |