summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2016-04-27 21:31:55 +0200
committerAlexander Larsson <alexl@redhat.com>2016-04-27 21:31:55 +0200
commit522d1e8d94640a765e69a89cce72f63fa7043572 (patch)
tree7ee292428a3bde5bd22e9bbd0044825fbd1c6f44
parent92011c6152cc94128389f5bbbd399f4a24d55c1b (diff)
parentc6c8008e11a5442c00093339925f5f9136b5a124 (diff)
Merge commit 'c6c8008e11a5442c00093339925f5f9136b5a124'
Diffstat
-rw-r--r--clang-detect-aarch64-gcc.patch11
-rw-r--r--org.freedesktop.Sdk.json207
2 files changed, 203 insertions, 15 deletions
diff --git a/clang-detect-aarch64-gcc.patch b/clang-detect-aarch64-gcc.patch
new file mode 100644
index 0000000..18e7247
--- /dev/null
+++ b/clang-detect-aarch64-gcc.patch
@@ -0,0 +1,11 @@
+--- clang-1/lib/Driver/ToolChains.cpp 2016-04-15 20:36:37.825903494 +0100
++++ /home/tristan/clang-copy/lib/Driver/ToolChains.cpp 2016-04-15 20:34:02.980104915 +0100
+@@ -1418,7 +1418,7 @@ bool Generic_GCC::GCCInstallationDetecto
+ static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+ static const char *const AArch64Triples[] = {
+ "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-linux-android",
+- "aarch64-redhat-linux"};
++ "aarch64-redhat-linux", "aarch64-unknown-linux"};
+ static const char *const AArch64beLibDirs[] = {"/lib"};
+ static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
+ "aarch64_be-linux-gnu"};
diff --git a/org.freedesktop.Sdk.json b/org.freedesktop.Sdk.json
index 1eded6a..90d9d3e 100644
--- a/org.freedesktop.Sdk.json
+++ b/org.freedesktop.Sdk.json
@@ -74,6 +74,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/bigreqsproto-1.1.2.tar.bz2",
"sha256": "462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -85,6 +92,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/compositeproto-0.4.2.tar.bz2",
"sha256": "049359f0be0b2b984a8149c966dd04e8c58e6eade2a4a309cf1126635ccd0cfc"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -96,6 +110,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/damageproto-1.2.1.tar.bz2",
"sha256": "5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -107,6 +128,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/dmxproto-2.3.1.tar.bz2",
"sha256": "e72051e6a3e06b236d19eed56368117b745ca1e1a27bdc50fd51aa375bea6509"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -118,6 +146,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/evieext-1.1.1.tar.bz2",
"sha256": "1cf74114436d99f56577a90b6438a32ba31b8128c9e63842bb179aba592733fe"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -129,6 +164,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/fixesproto-5.0.tar.bz2",
"sha256": "ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -195,6 +237,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/recordproto-1.14.2.tar.bz2",
"sha256": "a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -206,6 +255,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/renderproto-0.11.1.tar.bz2",
"sha256": "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -217,6 +273,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/resourceproto-1.2.0.tar.bz2",
"sha256": "3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -228,6 +291,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/scrnsaverproto-1.2.2.tar.bz2",
"sha256": "8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -250,6 +320,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xcmiscproto-1.2.2.tar.bz2",
"sha256": "b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -261,6 +338,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xextproto-7.3.0.tar.bz2",
"sha256": "f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -283,6 +367,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xf86dgaproto-2.1.tar.bz2",
"sha256": "ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -294,6 +385,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xf86driproto-2.1.1.tar.bz2",
"sha256": "9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -305,6 +403,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xf86miscproto-0.9.3.tar.bz2",
"sha256": "45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -316,6 +421,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2",
"sha256": "45d9499aa7b73203fd6b3505b0259624afed5c16b941bd04fcf123e5de698770"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -327,6 +439,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.1.tar.bz2",
"sha256": "977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -349,6 +468,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2",
"sha256": "7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -360,6 +486,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/proto/dri2proto-2.8.tar.bz2",
"sha256": "f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -503,6 +636,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/lib/libXdamage-1.1.4.tar.bz2",
"sha256": "7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -646,6 +786,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-1.2.2.tar.bz2",
"sha256": "8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -690,6 +837,13 @@
"type": "archive",
"url": "http://xorg.freedesktop.org/archive/individual/lib/libXcomposite-0.4.4.tar.bz2",
"sha256": "ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -819,7 +973,7 @@
},
{
"name": "xkeyboard-config",
- "config-opts": [ "--enable-compat-rules" "--with-xkb-base=/usr/share/X11/xkb", "--with-xkb-rules-symlink=xorg"],
+ "config-opts": [ "--enable-compat-rules", "--with-xkb-base=/usr/share/X11/xkb", "--with-xkb-rules-symlink=xorg"],
"sources": [
{
"type": "archive",
@@ -912,6 +1066,10 @@
"type": "archive",
"url": "http://llvm.org/releases/3.8.0/cfe-3.8.0.src.tar.xz",
"sha256": "04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9"
+ },
+ {
+ "type": "patch",
+ "path": "clang-detect-aarch64-gcc.patch"
}
]
},
@@ -941,7 +1099,21 @@
{
"name": "mesa",
"build-options" : {
- "cxxflags": "-O2 -g -fno-rtti -fno-exceptions"
+ "cxxflags": "-O2 -g -fno-rtti -fno-exceptions",
+ "arch" : {
+ "i386" : {
+ "config-opts" : [
+ "--with-gallium-drivers=svga,swrast,nouveau,r600,r300,radeonsi",
+ "--with-dri-drivers=swrast,nouveau,radeon,r200,i915,i965"
+ ]
+ },
+ "aarch64" : {
+ "config-opts" : [
+ "--with-gallium-drivers=svga,swrast,nouveau,freedreno,vc4",
+ "--with-dri-drivers=swrast,nouveau,radeon,r200"
+ ]
+ }
+ }
},
"config-opts": [
"--disable-selinux",
@@ -960,9 +1132,7 @@
"--enable-gallium-llvm",
"--enable-llvm-shared-libs",
"--enable-dri",
- "--enable-sysfs",
- "--with-gallium-drivers=svga,swrast,nouveau,r600,r300,radeonsi",
- "--with-dri-drivers=swrast,nouveau,radeon,r200,i915,i965"
+ "--enable-sysfs"
],
"make-args": [ "MKDEP=/bin/true"],
"sources": [
@@ -1370,7 +1540,7 @@
{
"type": "file",
"path": "30-0-google-crosextra-caladea.conf"
- }
+ },
{
"type": "file",
"path": "google-crosextra-caladea.conf"
@@ -1548,6 +1718,13 @@
"type": "archive",
"url": "http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz",
"sha256": "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp /usr/share/gnu-config/config.sub .",
+ "cp /usr/share/gnu-config/config.guess ."
+ ]
}
]
},
@@ -1560,7 +1737,7 @@
"url": "http://pkgs.fedoraproject.org/repo/pkgs/hunspell-en/wordlist-20121024.tar.xz/10a7ff0b2209af7d22b14b219b98c9b5/wordlist-20121024.tar.xz",
"strip-components": 0,
"sha256": "0e3e127bfa2a8068f6913949d137e75c4d025ecb9cf1748b80a8176cdee53148"
- }
+ },
{
"type": "archive",
"strip-components": 0,
@@ -1653,8 +1830,8 @@
"sources": [
{
"type": "archive",
- "url": "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.0.tar.gz",
- "sha256": "b29815c73b17633baca9f07113e8ac476ae66412dec0d29a5045825c27a47234"
+ "url": "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz",
+ "sha256": "3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64"
}
]
},
@@ -1665,8 +1842,8 @@
"sources": [
{
"type": "archive",
- "url": "http://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.0.tar.gz",
- "sha256": "d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab"
+ "url": "http://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.1.tar.gz",
+ "sha256": "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21"
}
]
},
@@ -1676,8 +1853,8 @@
"sources": [
{
"type": "archive",
- "url": "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz",
- "sha256": "8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e"
+ "url": "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.14.tar.gz",
+ "sha256": "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
}
]
},
@@ -1687,8 +1864,8 @@
"sources": [
{
"type": "archive",
- "url": "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz",
- "sha256": "a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b"
+ "url": "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.tar.gz",
+ "sha256": "5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f"
}
]
},
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 02:34:59 +0000