pool/erlang
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 161909 from home:Andreas_Schwab:Factory

Browse Source 
- Fix ppc and arm patches so that they don't conflict

OBS-URL: https://build.opensuse.org/request/show/161909
OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang/erlang?expand=0&rev=72
This commit is contained in:
Matwey Kornilov 2013-03-31 10:54:49 +00:00 committed by Git OBS Bridge
parent fbfebbdfb9
commit 659e059e4a
4 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erlang-ppc.patch
View File

@ -1,12 +1,24 @@
Index: otp_src_R14B04/erts/configure
Index: otp_src_R16B/erts/configure
===================================================================
--- otp_src_R14B04.orig/erts/configure
+++ otp_src_R14B04/erts/configure
@@ -5249,6 +5249,7 @@ case $chk_arch_ in
--- otp_src_R16B.orig/erts/configure
+++ otp_src_R16B/erts/configure
@@ -5404,6 +5404,7 @@ case $chk_arch_ in
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
+ powerpc) ARCH=ppc;;
+ powerpc) ARCH=ppc;;
ppc) ARCH=ppc;;
ppc64) ARCH=ppc64;;
"Power Macintosh") ARCH=ppc;;
Index: otp_src_R16B/erts/configure.in
===================================================================
--- otp_src_R16B.orig/erts/configure.in
+++ otp_src_R16B/erts/configure.in
@@ -617,6 +617,7 @@ case $chk_arch_ in
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
+ powerpc) ARCH=ppc;;
ppc) ARCH=ppc;;
ppc64) ARCH=ppc64;;
"Power Macintosh") ARCH=ppc;;

5
erlang.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Mar 31 07:28:23 UTC 2013 - schwab@suse.de
- Fix ppc and arm patches so that they don't conflict
-------------------------------------------------------------------
Fri Mar 8 12:21:26 UTC 2013 - matwey.kornilov@gmail.com

3
erlang.spec
View File

@ -284,10 +284,7 @@ A Graphics System used to write platform independent user interfaces.
%setup -q -n otp_src_%{version}
%patch0 -p1 -b .rpath
%patch1 -p1
%ifarch %arm
%patch3 -p1
autoreconf -si ./erts
%endif
%patch4 -p1
chmod -R u+w .

27
fix-armv7hl.patch
View File

@ -1,15 +1,24 @@
diff --git a/erts/configure.in b/erts/configure.in
index 6ad1951..ce7e4ef 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -620,6 +620,7 @@ case $chk_arch_ in
Index: otp_src_R16B/erts/configure
===================================================================
--- otp_src_R16B.orig/erts/configure
+++ otp_src_R16B/erts/configure
@@ -5413,6 +5413,7 @@ case $chk_arch_ in
armv5tel) ARCH=arm;;
armv5tejl) ARCH=arm;;
armv7l) ARCH=arm;;
+ armv7hl) ARCH=arm;;
+ armv7hl) ARCH=arm;;
tile) ARCH=tile;;
*) ARCH=noarch;;
esac
Index: otp_src_R16B/erts/configure.in
===================================================================
--- otp_src_R16B.orig/erts/configure.in
+++ otp_src_R16B/erts/configure.in
@@ -626,6 +626,7 @@ case $chk_arch_ in
armv5tel) ARCH=arm;;
armv5tejl) ARCH=arm;;
armv7l) ARCH=arm;;
+ armv7hl) ARCH=arm;;
tile) ARCH=tile;;
*) ARCH=noarch;;
esac
--
1.7.10