diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
commit | bdf817c3549ba377334deb1161de703579670d62 (patch) | |
tree | c1b80c05c917cda2619e267049978f971bdad169 /core/gcc | |
parent | df609724f30aaccfb05d9fb73f68e7a37118f2f8 (diff) | |
parent | 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-client/PKGBUILD
community/dcron/PKGBUILD
community/freevo/PKGBUILD
community/gmerlin-avdecoder/PKGBUILD
community/hacburn/PKGBUILD
community/htmldoc/PKGBUILD
community/ibus-table/PKGBUILD
community/iksemel/PKGBUILD
community/isomaster/PKGBUILD
community/libmatio/PKGBUILD
community/libtlen/PKGBUILD
community/luarocks/PKGBUILD
community/lxde-common/PKGBUILD
community/multipath-tools/PKGBUILD
community/nvclock/PKGBUILD
community/pam-krb5/PKGBUILD
community/pidgin-musictracker/PKGBUILD
community/pkgfile/PKGBUILD
community/pkgtools/PKGBUILD
community/print-manager/PKGBUILD
community/python-pyro/PKGBUILD
community/python-pyxmpp/PKGBUILD
community/python2-simplejson/PKGBUILD
community/rsnapshot/PKGBUILD
community/setconf/PKGBUILD
community/tagpy/PKGBUILD
community/terminator/PKGBUILD
community/udunits/PKGBUILD
community/vlock/PKGBUILD
community/winefish/PKGBUILD
core/nss-myhostname/PKGBUILD
extra/avfs/PKGBUILD
extra/bmp-musepack/PKGBUILD
extra/bmp-wma/PKGBUILD
extra/bochs/PKGBUILD
extra/botan/PKGBUILD
extra/cdargs/PKGBUILD
extra/cx_freeze/PKGBUILD
extra/dcfldd/PKGBUILD
extra/devilspie/PKGBUILD
extra/emelfm2/PKGBUILD
extra/evilwm/PKGBUILD
extra/fssos-nsvs/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-gap/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gmpc/PKGBUILD
extra/gtkpod/PKGBUILD
extra/hercules/PKGBUILD
extra/herqq/PKGBUILD
extra/hydrogen/PKGBUILD
extra/kdegames/PKGBUILD
extra/kradio/PKGBUILD
extra/kshutdown/PKGBUILD
extra/libmusicbrainz4/PKGBUILD
extra/mahjong/PKGBUILD
extra/mcrypt/PKGBUILD
extra/monica/PKGBUILD
extra/mpck/PKGBUILD
extra/mrtg/PKGBUILD
extra/nicotine/PKGBUILD
extra/normalize/PKGBUILD
extra/oprofile/PKGBUILD
extra/perl-event/PKGBUILD
extra/perl-unicode-string/PKGBUILD
extra/pidgin-encryption/PKGBUILD
extra/proftpd/PKGBUILD
extra/pymad/PKGBUILD
extra/qiv/PKGBUILD
extra/quodlibet/PKGBUILD
extra/ratpoison/PKGBUILD
extra/rox/PKGBUILD
extra/scrot/PKGBUILD
extra/stardict/PKGBUILD
extra/terminal/PKGBUILD
extra/usbview/PKGBUILD
extra/xdelta/PKGBUILD
extra/xdelta3/PKGBUILD
extra/xorg-xlsfonts/PKGBUILD
extra/zile/PKGBUILD
mozilla-testing/iceweasel-libre/mozconfig
mozilla-testing/iceweasel-libre/vendor.js
social/tokyocabinet/PKGBUILD
~fauno/notmuch/PKGBUILD
~mtjm/thinkfan/PKGBUILD
~mtjm/zbar/PKGBUILD
Diffstat (limited to 'core/gcc')
-rw-r--r-- | core/gcc/gcc-4.7.0-cloog-0.17.patch | 24 | ||||
-rw-r--r-- | core/gcc/gcc-4.7.1-libada-pic.patch | 12 | ||||
-rw-r--r-- | core/gcc/gcc-4.7.1-libgo-mksysinfo.patch | 15 | ||||
-rw-r--r-- | core/gcc/gcc_pure64.patch | 26 |
4 files changed, 0 insertions, 77 deletions
diff --git a/core/gcc/gcc-4.7.0-cloog-0.17.patch b/core/gcc/gcc-4.7.0-cloog-0.17.patch deleted file mode 100644 index c7146fa04..000000000 --- a/core/gcc/gcc-4.7.0-cloog-0.17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; diff --git a/core/gcc/gcc-4.7.1-libada-pic.patch b/core/gcc/gcc-4.7.1-libada-pic.patch deleted file mode 100644 index 591da1e4a..000000000 --- a/core/gcc/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/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch deleted file mode 100644 index 427efe8a6..000000000 --- a/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 -+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 -@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | - # The rusage struct. - rusage=`grep '^type _rusage struct' gen-sysinfo.go` - if test "$rusage" != ""; then -- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -- rusage=`echo $rusage | sed -e 's/^ *//'` - # Remove anonymous unions from GNU/Linux <bits/resource.h>. - rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` -+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -+ rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do - field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/core/gcc/gcc_pure64.patch b/core/gcc/gcc_pure64.patch deleted file mode 100644 index a9b09bbcf..000000000 --- a/core/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h ---- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000 -@@ -28,6 +28,6 @@ - #define GNU_USER_LINK_EMULATION64 "elf_x86_64" - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64 ---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000 -@@ -34,8 +34,8 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64 --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32 - - LIBGCC = stmp-multilib |