aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2016-11-27 18:59:54 +0100
committerRicardo Wurmus <rekado@elephly.net>2016-11-27 18:59:54 +0100
commitbac640997072a3f1b729eaa7df04d94bd0675bb0 (patch)
tree9aaab0c5b3c13aaae4930d93b102ce81ed97e42a
parent8c4140e49e496bbf1d71331333127bf68e48e18e (diff)
downloadguix-bac640997072a3f1b729eaa7df04d94bd0675bb0.tar
guix-bac640997072a3f1b729eaa7df04d94bd0675bb0.tar.gz
gnu: gcj: Correct paths in ARM patch.
* gnu/packages/patches/gcj-arm-mode.patch: Strip directories.
-rw-r--r--gnu/packages/patches/gcj-arm-mode.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/patches/gcj-arm-mode.patch b/gnu/packages/patches/gcj-arm-mode.patch
index 16fdb5ecac..a3f999f7e9 100644
--- a/gnu/packages/patches/gcj-arm-mode.patch
+++ b/gnu/packages/patches/gcj-arm-mode.patch
@@ -3,8 +3,8 @@ https://sources.debian.net/data/main/g/gcc-4.9/4.9.2-10/debian/patches/gcj-arm-m
# DP: For armhf, force arm mode instead of thumb mode
---- a/src/libjava/configure.host
-+++ b/src/libjava/configure.host
+--- a/libjava/configure.host
++++ b/libjava/configure.host
@@ -66,6 +66,9 @@
;;
esac
@@ -15,8 +15,8 @@ https://sources.debian.net/data/main/g/gcc-4.9/4.9.2-10/debian/patches/gcj-arm-m
AM_RUNTESTFLAGS=
# Set any host dependent compiler flags.
---- a/src/gcc/java/lang-specs.h
-+++ b/src/gcc/java/lang-specs.h
+--- a/gcc/java/lang-specs.h
++++ b/gcc/java/lang-specs.h
@@ -47,7 +47,7 @@
%{.class|.zip|.jar|!fsyntax-only:jc1 \
%{.java|fsaw-java-file:%U.jar -fsource-filename=%i %<ffilelist-file} \
@@ -26,8 +26,8 @@ https://sources.debian.net/data/main/g/gcc-4.9/4.9.2-10/debian/patches/gcj-arm-m
%{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*}\
%(invoke_as)}",
0, 0, 0},
---- a/src/libjava/libgcj.spec.in
-+++ b/src/libjava/libgcj.spec.in
+--- a/libjava/libgcj.spec.in
++++ b/libjava/libgcj.spec.in
@@ -9,4 +9,4 @@
%rename lib liborig
*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LDLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)