diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
| commit | c94bf77ede06fa67fd3222ffa3fcad8898e1fd59 (patch) | |
| tree | 3e4cc7f273a07c12fd69c589da434717e523664f /multilib | |
| parent | 0f89996e6f908cc405cd44478860b864dcb189f1 (diff) | |
| parent | 3b99c42eb8ca744e86e4e17197b1bf10642c6785 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/nginx/PKGBUILD
community-testing/nginx/nginx.install
community/chrony/PKGBUILD
community/lxdm/PKGBUILD
community/oidentd/PKGBUILD
community/oss/PKGBUILD
community/pdnsd/PKGBUILD
community/ruby-cairo/PKGBUILD
community/subtle/PKGBUILD
core/kmod/PKGBUILD
core/lvm2/PKGBUILD
core/openldap/PKGBUILD
core/systemd/PKGBUILD
extra/smartmontools/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'multilib')
| -rw-r--r-- | multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch | 12 | ||||
| -rw-r--r-- | multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch | 13 |
2 files changed, 0 insertions, 25 deletions
diff --git a/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch b/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch deleted file mode 100644 index 591da1e4a..000000000 --- a/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in ---- gcc-4.7.1-orig/libada/Makefile.in 2012-06-13 01:12:37.000000000 +1000 -+++ gcc-4.7.1/libada/Makefile.in 2012-06-16 15:04:32.179911023 +1000 -@@ -54,7 +54,7 @@ - PICFLAG = @PICFLAG@ - GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc - GNATLIBCFLAGS= -g -O2 --GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \ -+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \ - -fexceptions -DIN_RTS @have_getipinfo@ - - host_subdir = @host_subdir@ diff --git a/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch b/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch deleted file mode 100644 index a7be83fda..000000000 --- a/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c ---- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000 -+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000 -@@ -17,7 +17,8 @@ - G* g = runtime_g(); - - if(g == nil || g->writebuf == nil) { -- runtime_write(2, v, n); -+ ssize_t bytesWritten = runtime_write(2, v, n); -+ (void)bytesWritten; - return; - } - |