diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:10:31 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:10:31 -0300 |
| commit | f5ed25b75901e05f9933b548c8bbdda654608c32 (patch) | |
| tree | 37db6969ba4d61e110bab354ab6dc0db64f0a633 /extra/gpart | |
| parent | 1200fd46a32625f2ac4b035653cb49c22cce6426 (diff) | |
| parent | bc0657f7159d0b01373ecb59afc426b98a172b1e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dangerdeep/PKGBUILD
community/lsb-release/PKGBUILD
community/perl-gtk2-mozembed/PKGBUILD
extra/camsource/PKGBUILD
extra/gsf-sharp/PKGBUILD
extra/muine/PKGBUILD
extra/ocfs2-tools/PKGBUILD
extra/telepathy-kde-accounts-kcm-plugins/PKGBUILD
Diffstat (limited to 'extra/gpart')
| -rw-r--r-- | extra/gpart/gpart-0.1h-PIC.patch | 20 | ||||
| -rw-r--r-- | extra/gpart/gpart-0.1h-no-_syscall.patch | 15 |
2 files changed, 0 insertions, 35 deletions
diff --git a/extra/gpart/gpart-0.1h-PIC.patch b/extra/gpart/gpart-0.1h-PIC.patch deleted file mode 100644 index e810bd999..000000000 --- a/extra/gpart/gpart-0.1h-PIC.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gpart-0.1h/src/l64seek.c -+++ gpart-0.1h/src/l64seek.c -@@ -26,7 +26,7 @@ - } ostck[OSTACKLEN]; - static int osptr = -1; - --#if defined(__linux__) && defined(__i386__) -+#if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) - _syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) - #endif - -@@ -36,7 +36,7 @@ - { - off64_t ret = (off64_t)-1; - --#if defined(__linux__) && defined(__i386__) -+#if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) - int iret; - unsigned long ohi, olo; - diff --git a/extra/gpart/gpart-0.1h-no-_syscall.patch b/extra/gpart/gpart-0.1h-no-_syscall.patch deleted file mode 100644 index fe68d08b6..000000000 --- a/extra/gpart/gpart-0.1h-no-_syscall.patch +++ /dev/null @@ -1,15 +0,0 @@ -use syscall() rather than _syscall#() - -http://bugs.gentoo.org/163800 - ---- src/l64seek.c -+++ src/l64seek.c -@@ -27,7 +27,7 @@ - static int osptr = -1; - - #if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) --_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) -+#define _llseek(fd,hi,lo,res,wh) syscall(__NR__llseek,fd,hi,lo,res,wh) - #endif - - |