nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gcj: Correct paths in ARM patch. 

* gnu/packages/patches/gcj-arm-mode.patch: Strip directories.
This commit is contained in:
Ricardo Wurmus 2016-11-27 18:59:54 +01:00
parent 8c4140e49e
commit bac6409970
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/patches/gcj-arm-mode.patch
View File

@ -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 # DP: For armhf, force arm mode instead of thumb mode
--- a/src/libjava/configure.host --- a/libjava/configure.host
+++ b/src/libjava/configure.host +++ b/libjava/configure.host
@@ -66,6 +66,9 @@ @@ -66,6 +66,9 @@
;; ;;
esac 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= AM_RUNTESTFLAGS=
# Set any host dependent compiler flags. # Set any host dependent compiler flags.
--- a/src/gcc/java/lang-specs.h --- a/gcc/java/lang-specs.h
+++ b/src/gcc/java/lang-specs.h +++ b/gcc/java/lang-specs.h
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
%{.class|.zip|.jar|!fsyntax-only:jc1 \ %{.class|.zip|.jar|!fsyntax-only:jc1 \
%{.java|fsaw-java-file:%U.jar -fsource-filename=%i %<ffilelist-file} \ %{.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*}\ %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*}\
%(invoke_as)}", %(invoke_as)}",
0, 0, 0}, 0, 0, 0},
--- a/src/libjava/libgcj.spec.in --- a/libjava/libgcj.spec.in
+++ b/src/libjava/libgcj.spec.in +++ b/libjava/libgcj.spec.in
@@ -9,4 +9,4 @@ @@ -9,4 +9,4 @@
%rename lib liborig %rename lib liborig
*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LDLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig) *lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LDLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)