diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-12-11 08:22:04 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-12-11 08:23:48 +0200 |
| commit | e7066615fbc87b519adb580a208a4905f992d401 (patch) | |
| tree | 7c53676c8853641bd5ae76cca8209fb0779b408b /main | |
| parent | d75e8d77a6d1c5df59f53a584d40a48b27d37ffc (diff) | |
| download | aports-e7066615fbc87b519adb580a208a4905f992d401.tar.bz2 aports-e7066615fbc87b519adb580a208a4905f992d401.tar.xz | |
main/gcc: fix muslgnueabi detection in ada bootstrap
Diffstat (limited to 'main')
| -rw-r--r-- | main/gcc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/gcc/ada-musl.patch | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 0bbf5d4c46..db67c6db77 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -666,7 +666,7 @@ e17bbb0fe802974e20645b4182b4c410 fix-gcj-iconv-musl.patch a4ccdeee63d0ab08d5e6165cb32b66ff ada-no-pie.patch 2b4235111d2e66f2c690eb340cb4178b ada-fixes.patch 20e2731c02ce50739ebdead2795f9c41 ada-shared.patch -4ff5449f23606aa39d5b83153c4b4b03 ada-musl.patch +53507a99968c512a47b023f48615ec6e ada-musl.patch a2f435d81e872a73a8b44a4581832af0 vanilla.specs 17a31b8580de9dd9c06a1ed96886d538 hardenednossp.specs 33ce2d221828a2d03978da52ba609524 hardenednopie.specs @@ -711,7 +711,7 @@ a5678380e887dbf600c59273d382e81c10f89d28e422238a617d0a43ad5c5a69 fix-cxxflags-f 7b71cd7c3c186ae488d2e2af169816e4f0f19782fc0e7bc6f9d0a9032e09ee5e ada-no-pie.patch ca0db7f59e7af0c621751eee9e3775d4c00c4b663f82f9e04c53a2efb16edca1 ada-fixes.patch d6c7fc1820a4fa285297c299c255fe2f19ce1695486f20edd098252a97545e6a ada-shared.patch -b7c54c7c8b0449ddbe836dc207174c730633da8828c0ffe1960b5c6024d2998a ada-musl.patch +6ce09a5290f378dd3ec91b51d102065e3cea09c8471d05bc0598aee18f703635 ada-musl.patch 1315d4c430b4d81c61d14a252d7681125fd7d79fde457c014c18c62c4f1aa1de vanilla.specs 50a46bb1c4d209ce687d13e74cc9e4e0b87cef4a8165d22fb9be243c9cf08374 hardenednossp.specs 8eccfcf282fb54aadede7c23a8b5b843c0a63a55485e74d4332ab49025d38e78 hardenednopie.specs @@ -756,7 +756,7 @@ c731f4aaaa65c8950e1b2bd9331410f92d378fd8c7e718532dccaa27ee11984d51d74216c3611e89 e80a08de4b43fb71f7699bcce360cd99bc525dab20b9109e7152bd211def5d8e728f88771ed59f15ed520cbf069364debc4f822c10a1abf7e2c7badd67e1c83c ada-no-pie.patch b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc260cf813e58602617e9e629ea8177133bfdf5972398fe1c55 ada-fixes.patch 3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19 ada-shared.patch -653b2aefc8cfb81589cf3540928a73998f33556d603c2a6afaeb1ce68c1069709036e577b44db1871bcdaa0fc6f25bbf137ae08cd6f8e925f388aeac9dadac3a ada-musl.patch +83fe6eb7137492c69c11751a7e3ca9f833acd0d044fff51f026b0e601ea0ba98ad2ae7d8fe31a14c139daa4309b4cdfeae54bcf62bcbb05768024ac9fdc5e7dc ada-musl.patch 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb vanilla.specs e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12 hardenednossp.specs b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168 hardenednopie.specs diff --git a/main/gcc/ada-musl.patch b/main/gcc/ada-musl.patch index ebbe852225..1859faf35b 100644 --- a/main/gcc/ada-musl.patch +++ b/main/gcc/ada-musl.patch @@ -123,3 +123,14 @@ diff -ru gcc-4.9.2/gcc/ada/adaint.h gcc-4.9.2/gcc/ada/adaint.h #endif #if defined (_WIN32) +--- gcc-4.9.2/gcc/ada/gcc-interface/Makefile.in.orig 2014-12-11 08:16:33.364902456 -0200 ++++ gcc-4.9.2/gcc/ada/gcc-interface/Makefile.in 2014-12-11 08:16:51.998236755 -0200 +@@ -1948,7 +1948,7 @@ + endif + + # ARM linux, GNU eabi +-ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),) ++ifeq ($(strip $(filter-out arm% linux-%gnueabi%,$(target_cpu) $(target_os))),) + LIBGNAT_TARGET_PAIRS = \ + a-intnam.ads<a-intnam-linux.ads \ + s-inmaop.adb<s-inmaop-posix.adb \ |