diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
commit | fbe815aa83090984779a8b380cbfc1247353d98b (patch) | |
tree | 2eb92ffe4f5cb6c6c13f065f3122d9f18264b6c6 /multilib | |
parent | d638a96c43b3c4fb9b517e8a66a4e8b1fa999833 (diff) | |
parent | d22b68a6758c4f29a8e50a7be467374a53c68415 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/qtfm/PKGBUILD
core/binutils/PKGBUILD
core/fakeroot/PKGBUILD
core/gcc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/audacious/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/vigra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-libgcrypt/PKGBUILD
multilib/lib32-libgpg-error/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-tdb/PKGBUILD
multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'multilib')
-rw-r--r-- | multilib/dev86/PKGBUILD | 48 | ||||
-rw-r--r-- | multilib/dev86/dev86-0.16.17-fortify.patch | 43 | ||||
-rw-r--r-- | multilib/dev86/dev86-pic.patch | 20 | ||||
-rwxr-xr-x | multilib/lib32-curl/PKGBUILD | 56 | ||||
-rw-r--r-- | multilib/lib32-gettext/PKGBUILD | 38 | ||||
-rw-r--r-- | multilib/lib32-glib2/PKGBUILD | 40 | ||||
-rw-r--r-- | multilib/nspluginwrapper/PKGBUILD | 47 |
7 files changed, 0 insertions, 292 deletions
diff --git a/multilib/dev86/PKGBUILD b/multilib/dev86/PKGBUILD deleted file mode 100644 index 634592a08..000000000 --- a/multilib/dev86/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 59310 2011-11-23 10:19:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com> -# Contributor: Suat SARIALP <muhendis.suat@gmail.com> - -pkgname=dev86 -pkgver=0.16.18 -pkgrel=2 -pkgdesc="Simple C compiler to generate 8086 code" -arch=('i686' 'x86_64') -url="http://www.debath.co.uk/dev86/" -license=(GPL) -[ "${CARCH}" == "x86_64" ] && depends=('lib32-glibc') -makedepends=('bin86') -options=('!libtool' '!strip' '!makeflags') -source=(http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz - dev86-pic.patch - dev86-0.16.17-fortify.patch) -md5sums=('f2e06b547397383b2b2650b9c4fd9bab' - '1b750c5561a4bde5f83f65e5827feb73' - '07238f9203c6528ea1e34198e771ea12') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np0 -i $srcdir/dev86-pic.patch - patch -Np1 -i $srcdir/dev86-0.16.17-fortify.patch - if [ "${CARCH}" = "x86_64" ]; then - # x86_64 fix - sed -i.orig -e 's,alt-libs elksemu,alt-libs,' \ - -e 's,install-lib install-emu,install-lib,' \ - $srcdir/$pkgname-$pkgver/makefile.in - sed -i -e "s/-O2 -g/-O2 -g -m32/" makefile.in - sed -i 's|^LDFLAGS.*=$|LDFLAGS=-m32|' makefile.in - fi - - unset CFLAGS - unset LDFLAGS - unset CPPFLAGS - unset CXXFLAGS - - make PREFIX=/usr DIST="$pkgdir" - make install-all DIST="$pkgdir" - mkdir -p $pkgdir/usr/share - mv $pkgdir/usr/man $pkgdir/usr/share - # remove all the stuff supplied by bin86 - rm $pkgdir/usr/bin/{as,ld,nm,objdump,size}86 - rm $pkgdir/usr/share/man/man1/{as,ld}86.1 -} diff --git a/multilib/dev86/dev86-0.16.17-fortify.patch b/multilib/dev86/dev86-0.16.17-fortify.patch deleted file mode 100644 index 715d0c4ca..000000000 --- a/multilib/dev86/dev86-0.16.17-fortify.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- dev86-0.16.17/bcc/bcc.c -+++ dev86-0.16.17/bcc/bcc.c -@@ -19,6 +19,7 @@ - #ifdef __STDC__ - #include <stdlib.h> - #ifndef MSDOS -+#include <limits.h> - #include <unistd.h> - #endif - #else -@@ -596,12 +597,17 @@ - } - } - --void --command_reset() --{ - #ifndef MAXPATHLEN -+#ifdef PATH_MAX -+#define MAXPATHLEN PATH_MAX -+#else - #define MAXPATHLEN 1024 - #endif -+#endif -+ -+void -+command_reset() -+{ - char buf[MAXPATHLEN]; - char ** prefix; - char * saved_cmd; -@@ -1308,11 +1314,7 @@ - - for(d=s=ptr; d && *s; s=d) - { --#ifdef MAXPATHLEN - char buf[MAXPATHLEN]; --#else -- char buf[1024]; --#endif - - free(temp); - d=strchr(s, ':'); diff --git a/multilib/dev86/dev86-pic.patch b/multilib/dev86/dev86-pic.patch deleted file mode 100644 index 439c2648b..000000000 --- a/multilib/dev86/dev86-pic.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100 -+++ elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100 -@@ -129,8 +129,17 @@ - static inline int vm86_mine(struct vm86_struct* v86) - { - int __res; -+#ifndef __PIC__ - __asm__ __volatile__("int $0x80\n" - :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86)); -+#else -+ __asm__ __volatile__( -+ "movl %%ebx,%%ecx\n\t" -+ "movl %2,%%ebx\n\t" -+ "int $0x80\n\t" -+ "movl %%ecx,%%ebx\n\t" -+ :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx"); -+#endif - return __res; - } - #endif diff --git a/multilib/lib32-curl/PKGBUILD b/multilib/lib32-curl/PKGBUILD deleted file mode 100755 index 264a41750..000000000 --- a/multilib/lib32-curl/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ -# Maintainer: Florian Pritz <flo@xssn.at> - -_pkgbasename=curl -pkgname=lib32-$_pkgbasename -pkgver=7.21.7 -pkgrel=1 -pkgdesc="An URL retrieval utility and library (32-bit)" -arch=('x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' 'lib32-libssh2' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=("http://curl.haxx.se/download/${_pkgbasename}-${pkgver}.tar.bz2") -md5sums=('5f6d50c4d4ee38c57fe37e3cff75adbd') - - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - - ./configure \ - --with-random=/dev/urandom \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ - --disable-ldap \ - --disable-manual \ - --enable-versioned-symbols \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ - --without-libidn \ - --libdir=/usr/lib32 \ - --enable-threaded-resolver - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{share,bin} - #we need curlbuild.h - find ${pkgdir}/usr/include/curl -type f -not -name curlbuild.h -delete - #now save it as curlbuild-32.h - mv ${pkgdir}/usr/include/curl/curlbuild.h ${pkgdir}/usr/include/curl/curlbuild-32.h - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-gettext/PKGBUILD b/multilib/lib32-gettext/PKGBUILD deleted file mode 100644 index 94f9b4aa5..000000000 --- a/multilib/lib32-gettext/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Joakim Hernberg <jhernberg at alchemy dot lu> -_pkgbasename=gettext -pkgname=lib32-$_pkgbasename -pkgver=0.18.1.1 -pkgrel=2 -pkgdesc="GNU internationalization library (32-bit)" -arch=('x86_64') -url="http://www.gnu.org/software/gettext/" -license=('GPL') -depends=('lib32-acl' $_pkgbasename) -makedepends=(gcc-multilib) -optdepends=('cvs: for autopoint tool') -options=(!libtool !docs) -source=(ftp://ftp.gnu.org/pub/gnu/gettext/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('3dd55b952826d2b32f51308f2f91aa89') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c - ./configure --prefix=/usr --enable-csharp --libdir=/usr/lib32 - make -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make check -#} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD deleted file mode 100644 index b041355be..000000000 --- a/multilib/lib32-glib2/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 60174 2011-12-06 15:20:01Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=glib2 -pkgname=lib32-$_pkgbasename -pkgver=2.30.2 -pkgrel=1 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" -url="http://www.gtk.org/" -arch=('x86_64') -license=('LGPL') -depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename) -makedepends=('gcc-multilib' python2) -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz) -sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/glib-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ - --enable-static --enable-shared --with-pcre=system --disable-fam - make -} - -package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/{etc,usr/{share,include}} - - cd "${pkgdir}"/usr/bin - mv gio-querymodules gio-querymodules-32 - rm -f gdbus glib* gobject-query gsettings gtester* - rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0} -} diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD deleted file mode 100644 index 7e9d8b5fe..000000000 --- a/multilib/nspluginwrapper/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 60061 2011-12-04 15:24:45Z bluewind $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=nspluginwrapper -pkgver=1.4.4 -pkgrel=2 -pkgdesc="Cross-platform NPAPI compatible plugin viewer" -arch=('i686' 'x86_64') -url="http://nspluginwrapper.davidben.net/" -license=('GPL') -depends=( - 'curl' - 'libxt' 'lib32-libxt' - 'gcc-libs' 'lib32-gcc-libs' - 'gtk2' 'lib32-gtk2' -) -makedepends=('gcc-multilib') -install="install" -source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('36f3e290fc4ce56f65ee695078961188') - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -fi - -build() { - cd "$srcdir/$pkgname-$pkgver" - - configure_args="" - if [[ $CARCH == x86_64 ]]; then - configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib" - fi - - ./configure $configure_args - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make -j1 DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: |