summaryrefslogtreecommitdiff
path: root/multilib-testing
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-04-03 14:54:55 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-04-03 14:54:55 +0000
commitb618c3d0693aec564c6746238fd05d94e31d3b76 (patch)
tree4a4834f3097bba25dba1adeba4324080c1b4bf7b /multilib-testing
parent8cb5196780766f47b595410eed8ddbee2e8add08 (diff)
Tue Apr 3 14:54:45 UTC 2012
Diffstat (limited to 'multilib-testing')
-rw-r--r--multilib-testing/gcc-multilib/gcc-4.6.2-cloog-0.17.patch36
-rw-r--r--multilib-testing/gcc-multilib/gcc-hash-style-both.patch122
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch42
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch13
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch37
-rw-r--r--multilib-testing/lib32-libdrm/PKGBUILD53
-rw-r--r--multilib-testing/lib32-libdrm/git_fixes.diff13
-rw-r--r--multilib-testing/lib32-libdrm/no-pthread-stubs.patch66
-rw-r--r--multilib-testing/lib32-libpciaccess/PKGBUILD38
-rw-r--r--multilib-testing/lib32-libx11/PKGBUILD37
-rw-r--r--multilib-testing/lib32-libxcb/PKGBUILD41
-rw-r--r--multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch12
-rw-r--r--multilib-testing/lib32-libxi/PKGBUILD37
-rw-r--r--multilib-testing/lib32-llvm/PKGBUILD96
-rw-r--r--multilib-testing/lib32-llvm/cindexer-clang-path.patch10
-rw-r--r--multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch11
-rw-r--r--multilib-testing/lib32-llvm/clang-pure64.patch13
-rw-r--r--multilib-testing/lib32-llvm/enable-lto.patch32
-rw-r--r--multilib-testing/lib32-llvm/fix-gold-lto-linking.patch11
-rw-r--r--multilib-testing/lib32-mesa/PKGBUILD200
-rw-r--r--multilib-testing/lib32-mesa/fix-build-with-llvm-3.0.patch330
-rw-r--r--multilib-testing/lib32-util-linux/PKGBUILD44
22 files changed, 0 insertions, 1294 deletions
diff --git a/multilib-testing/gcc-multilib/gcc-4.6.2-cloog-0.17.patch b/multilib-testing/gcc-multilib/gcc-4.6.2-cloog-0.17.patch
deleted file mode 100644
index 0503a05ed..000000000
--- a/multilib-testing/gcc-multilib/gcc-4.6.2-cloog-0.17.patch
+++ /dev/null
@@ -1,36 +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 -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c 2011-03-13 08:05:38.000000000 +1000
-+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c 2012-02-03 17:51:47.943463879 +1000
-@@ -1367,7 +1367,7 @@
- /* Change cloog output language to C. If we do use FORTRAN instead, cloog
- will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
- we pass an incomplete program to cloog. */
-- options->language = LANGUAGE_C;
-+ options->language = CLOOG_LANGUAGE_C;
-
- /* Enable complex equality spreading: removes dummy statements
- (assignments) in the generated code which repeats the
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
-
- #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
-
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
- %{shared:-shared} \
- %{!shared: \
---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
- %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
-
- #undef LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
- { "dynamic_linker", LINUX_DYNAMIC_LINKER }
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-
-
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
-
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
-
---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
-
---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
-
- #undef LINK_SPEC
- #define LINK_SPEC \
-- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{static:-static} \
---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
- %{static:-static}} \
- "
-
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!static: \
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (eip);
- /* Note: %esi is zero. */
- movl %esi,%ebp /* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- jmp L(haspid)
- .previous
- #endif
-- cfi_endproc;
-
- cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (rip);
- /* Clear the frame pointer. The ABI suggests this be done, to mark
- the outermost frame obviously. */
- xorl %ebp, %ebp
-@@ -116,7 +113,6 @@
- /* Call exit with return value from function call. */
- movq %rax, %rdi
- call HIDDEN_JUMPTARGET (_exit)
-- cfi_endproc;
-
- cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- stdlib stdio-common libio malloc string wcsmbs time dirent \
- grp pwd posix io termios resource misc socket sysvipc gmon \
- gnulib iconv iconvdata wctype manual shadow gshadow po argp \
-- crypt nss localedata timezone rt conform debug \
-+ crypt nss localedata rt conform debug \
- $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
-
- ifndef avoid-generated
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- ns, ansp, ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- } else {
- /* Use datagrams. */
-@@ -559,7 +559,7 @@
- ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- if (v_circuit)
- // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- (*thisresplenp > *thisanssizp)
- ? *thisanssizp : *thisresplenp);
-
-- if (recvresp1 || (buf2 != NULL && recvresp2)) {
-- *resplen2 = 0;
-+ if (recvresp1 || (buf2 != NULL && recvresp2))
- return resplen;
-- }
- if (buf2 != NULL)
- {
-- /* No data from the first reply. */
-- resplen = 0;
- /* We are waiting for a possible second reply. */
- if (hp->id == anhp->id)
- recvresp1 = 1;
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD
deleted file mode 100644
index 703f55e9f..000000000
--- a/multilib-testing/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 68056 2012-03-17 15:05:46Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.32
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services (32-bit)"
-arch=(x86_64)
-license=('custom')
-depends=('lib32-libpciaccess' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
- no-pthread-stubs.patch)
-# git_fixes.diff)
-sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842'
- '1a9000f4c94d5bd13555e13e6e51716bf92a0eb8')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
-
- # git fixes - currently none
- # patch -Np1 -i ${srcdir}/git_fixes.diff
-
- # libtoolize --force
- autoreconf --force --install
- ./configure --prefix=/usr --libdir=/usr/lib32 \
- --enable-udev \
- --enable-intel \
- --enable-radeon \
- --enable-vmwgfx-experimental-api \
- --enable-nouveau-experimental-api
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libdrm/git_fixes.diff b/multilib-testing/lib32-libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/multilib-testing/lib32-libdrm/git_fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 19441f3..eb9dd32 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
- bufmgr_gem->vma_cache.next,
- vma_list);
- assert(bo_gem->map_count == 0);
-- DRMLISTDEL(&bo_gem->vma_list);
-+ DRMLISTDELINIT(&bo_gem->vma_list);
-
- if (bo_gem->mem_virtual) {
- munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 721626c0a..000000000
--- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
-
-
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/intel \
-- $(PTHREADSTUBS_CFLAGS) \
- $(PCIACCESS_CFLAGS) \
- -I$(top_srcdir)/include/drm
-
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
-- @PTHREADSTUBS_LIBS@ \
- @PCIACCESS_LIBS@ \
- @CLOCK_LIB@
-
---- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/radeon \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/include/drm
-
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
-
- libdrm_radeon_la_SOURCES = \
- radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- $(WARN_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/nouveau \
-- $(PTHREADSTUBS_CFLAGS) \
- -I$(top_srcdir)/include/drm
-
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
-
- libdrm_nouveau_la_SOURCES = \
- nouveau_device.c \
diff --git a/multilib-testing/lib32-libpciaccess/PKGBUILD b/multilib-testing/lib32-libpciaccess/PKGBUILD
deleted file mode 100644
index a807c9343..000000000
--- a/multilib-testing/lib32-libpciaccess/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 67124 2012-03-04 21:51:32Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-_pkgbasename=libpciaccess
-pkgname=lib32-${_pkgbasename}
-pkgver=0.13
-pkgrel=1
-pkgdesc="X11 PCI access library (32-bit"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' ${_pkgbasename})
-makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
-sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/include
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libx11/PKGBUILD b/multilib-testing/lib32-libx11/PKGBUILD
deleted file mode 100644
index e51b57017..000000000
--- a/multilib-testing/lib32-libx11/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 64508 2012-02-15 10:29:36Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libx11
-pkgname=lib32-$_pkgbasename
-pkgver=1.4.99.1
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxcb' 'xproto' 'kbproto' $_pkgbasename)
-makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib')
-options=('!libtool')
-license=('custom:XFREE86')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d')
-
-build() {
- export CC="gcc -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/libX11-${pkgver}"
- ./configure --prefix=/usr --disable-static --disable-xf86bigfont \
- --libdir=/usr/lib32 --disable-specs
- make
- make check
-}
-
-package() {
- cd "${srcdir}/libX11-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share}
-
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD
deleted file mode 100644
index b51422646..000000000
--- a/multilib-testing/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 64491 2012-02-14 11:43:17Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.8
-pkgrel=2
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'lib32-libxdmcp' 'lib32-libxau'
- $_pkgbasename)
-makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib'
- 'autoconf')
-options=('!libtool')
-license=('custom')
-source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2
- libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('18b76759d5bbb863777f37bf3aec23ebaa31d5be'
- '3455e84642283bc91c8313af319002a20bbcbdf4')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch"
-
- export CC="gcc -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput --libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share}
-
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index f17de1b1d..000000000
--- a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500
-+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500
-@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
-
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
-
- have_xdmcp="no"
diff --git a/multilib-testing/lib32-libxi/PKGBUILD b/multilib-testing/lib32-libxi/PKGBUILD
deleted file mode 100644
index f56b7c900..000000000
--- a/multilib-testing/lib32-libxi/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 64512 2012-02-15 11:13:00Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxi
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.99.3
-pkgrel=1
-pkgdesc="X11 Input extension library (32-bit)"
-arch=('x86_64')
-url="http://xorg.freedesktop.org"
-depends=('lib32-libxext' 'inputproto' $_pkgbasename)
-makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib)
-options=(!libtool)
-license=('custom')
-source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha1sums=('55de70d18b20341f307b80da035400ed0467c920')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/libXi-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
- --libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/libXi-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-llvm/PKGBUILD b/multilib-testing/lib32-llvm/PKGBUILD
deleted file mode 100644
index d2ba4e1a6..000000000
--- a/multilib-testing/lib32-llvm/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 64517 2012-02-15 17:57:32Z lcarlier $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('lib32-llvm')
-pkgver=3.0
-pkgrel=2
-arch=('x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('lib32-libffi' 'python2' 'gcc-multilib')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz)
-sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477')
-
-build() {
- cd "$srcdir/llvm-$pkgver.src"
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- # Fix installation directories, ./configure doesn't seem to set them right
- sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
- -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \
- -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
- Makefile.config.in
-
- # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
- sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
- # Apply strip option to configure
- _optimized_switch="enable"
- [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
- # Include location of libffi headers in CPPFLAGS
- export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib32/llvm \
- --sysconfdir=/etc \
- --enable-shared \
- --enable-libffi \
- --enable-targets=all \
- --disable-expensive-checks \
- --disable-debug-runtime \
- --disable-assertions \
- --with-binutils-include=/usr/include \
- --with-cxx-include-arch=$CHOST \
- --$_optimized_switch-optimized
-
- make REQUIRES_RTTI=1
-}
-
-package() {
- pkgdesc="Low Level Virtual Machine (32 bits version)"
- depends=('perl' 'lib32-libffi' 'llvm')
-
- cd "$srcdir/llvm-$pkgver.src"
-
- # We move the clang directory out of the tree so it won't get installed and
- # then we bring it back in for the clang package
- # mv tools/clang "$srcdir"
- # -j1 is due to race conditions during the installation of the OCaml bindings
- make -j1 DESTDIR="$pkgdir" install
-
- # Fix permissions of static libs
- chmod -x "$pkgdir"/usr/lib32/llvm/*.a
-
- # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
- sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config"
- mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config"
-
- # Get rid of example Hello transformation
- rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.*
-
- # Symlink the gold plugin where clang expects it
- ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so"
-
- # Add ld.so.conf.d entry
- install -d "$pkgdir/etc/ld.so.conf.d"
- echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf"
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}}
- mkdir "$pkgdir"/usr/bin
- mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32"
-}
diff --git a/multilib-testing/lib32-llvm/cindexer-clang-path.patch b/multilib-testing/lib32-llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/multilib-testing/lib32-llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-
- // We now have the CIndex directory, locate clang relative to it.
- LibClangPath.eraseComponent();
-+ LibClangPath.eraseComponent();
- #endif
-
- LibClangPath.appendComponent("clang");
diff --git a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- global: main;
- __progname;
- environ;
-+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
-
- local: *;
- };
diff --git a/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch
deleted file mode 100644
index 9bbbfaa8b..000000000
--- a/multilib-testing/lib32-llvm/clang-pure64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3306,7 +3306,7 @@
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
-- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
- }
-
- CmdArgs.push_back("-o");
diff --git a/multilib-testing/lib32-llvm/enable-lto.patch b/multilib-testing/lib32-llvm/enable-lto.patch
deleted file mode 100644
index 3c8691b17..000000000
--- a/multilib-testing/lib32-llvm/enable-lto.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp (revision 123373)
-+++ lib/Driver/ToolChains.cpp (working copy)
-@@ -1398,7 +1398,7 @@
- PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
- GCCInstallation.getTriple() + "/bin").str());
-
-- Linker = GetProgramPath("ld");
-+ Linker = GetProgramPath("ld.gold");
-
- LinuxDistro Distro = DetectLinuxDistro(Arch);
-
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3412,11 +3412,11 @@
- }
- }
-
-- if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+ // if (Args.hasArg(options::OPT_use_gold_plugin)) {
- CmdArgs.push_back("-plugin");
-- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
- CmdArgs.push_back(Args.MakeArgString(Plugin));
-- }
-+ // }
-
- C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch b/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch
deleted file mode 100644
index 84d166471..000000000
--- a/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile
---- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300
-+++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200
-@@ -26,6 +26,6 @@ LINK_COMPONENTS := support
- # Because off_t is used in the public API, the largefile parts are required for
- # ABI compatibility.
- CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT)
-+CXXFLAGS+=-L $(SharedLibDir) -lLTO
-
- include $(LEVEL)/Makefile.common
diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD
deleted file mode 100644
index 930f61f9a..000000000
--- a/multilib-testing/lib32-mesa/PKGBUILD
+++ /dev/null
@@ -1,200 +0,0 @@
-# $Id: PKGBUILD 64673 2012-02-17 17:53:28Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
- #pkgver=7.10.99.git20110709
- pkgver=7.11
- else
- pkgver=8.0.1
-fi
-
-pkgrel=1
-arch=('x86_64')
-makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1'
- 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-if [ "${_git}" = "true" ]; then
- # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
- #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
- source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
- md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd')
-else
- source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
- #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2")
- md5sums=('24eeebf66971809d8f40775a379b36c9')
-fi
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- # for our llvm-config for 32 bit
- export LLVM_CONFIG=/usr/bin/llvm-config32
-
- cd ${srcdir}/?esa-*
-
- autoreconf -vfi
-
- if [ "${_git}" = "true" ]; then
- ./autogen.sh --prefix=/usr \
- --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,nouveau,swrast \
- --enable-gallium-llvm \
- --disable-gallium-egl --enable-shared-glapi \
- --enable-shared-glapi \
- --enable-glx-tls \
- --enable-dri \
- --enable-gles1 \
- --enable-gles2 \
- --disable-egl \
- --enable-texture-float \
- --enable-shared-dricore \
- --enable-32-bit \
- --libdir=/usr/lib32
- # --enable-gallium-svga \
- else
- ./configure --prefix=/usr \
- --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,nouveau,swrast \
- --enable-gallium-llvm \
- --disable-gallium-egl --enable-shared-glapi \
- --enable-glx-tls \
- --with-driver=dri \
- --enable-gles1 \
- --enable-gles2 \
- --disable-egl \
- --enable-texture-float \
- --enable-shared-dricore \
- --enable-32-bit \
- --libdir=/usr/lib32
- fi
-
- make
-}
-
-package_lib32-libgl() {
- depends=('lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
- pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
- replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri')
-
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib32"
- install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
-
- bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
- bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
- bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
-
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
- ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
- install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
- ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
-}
-
-package_lib32-libglapi() {
- depends=('lib32-glibc' 'libglapi')
- pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
-
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib32"
- bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
- ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
-}
-
-package_lib32-libgles() {
- depends=('lib32-libglapi' 'libgles')
- pkgdesc="Mesa GLES libraries (32-bit)"
-
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib32"
- install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
- bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
- bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/"
- bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
- ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-#package_lib32-libegl() {
-# depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
-# pkgdesc="Mesa libEGL libraries (32-bit)"
-#
-# cd ${srcdir}/?esa-*
-# make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-#
-# install -m755 -d "${pkgdir}/usr/lib32"
-# install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-# install -m755 -d "${pkgdir}/usr/lib32/egl"
-# bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
-# bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
-# bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
-#
-# install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-# ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
-#}
-
-package_lib32-mesa() {
- depends=('lib32-libgl' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
- pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
-
- cd ${srcdir}/?esa-*
- make DESTDIR="${pkgdir}" install
-
- rm -f "${pkgdir}/usr/lib32/libGL.so"*
- rm -f "${pkgdir}/usr/lib32/libglapi.so"*
- rm -f "${pkgdir}/usr/lib32/libGLESv"*
- rm -f "${pkgdir}/usr/lib32/libEGL"*
- rm -rf "${pkgdir}/usr/lib32/egl"
- rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
- rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
-
- install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
- ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
-}
-
-package_lib32-ati-dri() {
- depends=("lib32-libgl=${pkgver}")
- pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
- conflicts=('xf86-video-ati<6.9.0-6')
-
- cd ${srcdir}/?esa-*/src/mesa/drivers/dri
- # classic mesa drivers for radeon,r200
- make -C radeon DESTDIR="${pkgdir}" install
- make -C r200 DESTDIR="${pkgdir}" install
- # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-intel-dri() {
- depends=("lib32-libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for Intel (32-bit)"
-
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-}
-
-package_lib32-nouveau-dri() {
- depends=("lib32-libgl=${pkgver}")
- pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
-
- # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
- # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
-
diff --git a/multilib-testing/lib32-mesa/fix-build-with-llvm-3.0.patch b/multilib-testing/lib32-mesa/fix-build-with-llvm-3.0.patch
deleted file mode 100644
index ceb5aa129..000000000
--- a/multilib-testing/lib32-mesa/fix-build-with-llvm-3.0.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c
-index 56c26f5..d477c40 100644
---- a/src/gallium/auxiliary/draw/draw_llvm.c
-+++ b/src/gallium/auxiliary/draw/draw_llvm.c
-@@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *var);
- * Create LLVM type for struct draw_jit_texture
- */
- static LLVMTypeRef
--create_jit_texture_type(struct gallivm_state *gallivm)
-+create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name)
- {
- LLVMTargetDataRef target = gallivm->target;
- LLVMTypeRef texture_type;
-@@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_state *gallivm)
- elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] =
- LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
-
-+#if HAVE_LLVM >= 0x0300
-+ texture_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(texture_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- texture_type = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-
-+ LLVMAddTypeName(gallivm->module, struct_name, texture_type);
-+
- /* Make sure the target's struct layout cache doesn't return
- * stale/invalid data.
- */
- LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width,
- target, texture_type,
-@@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_state *gallivm)
- */
- static LLVMTypeRef
- create_jit_context_type(struct gallivm_state *gallivm,
-- LLVMTypeRef texture_type)
-+ LLVMTypeRef texture_type, const char *struct_name)
- {
- LLVMTargetDataRef target = gallivm->target;
- LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context);
-@@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_state *gallivm,
- elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */
- elem_types[4] = LLVMArrayType(texture_type,
- PIPE_MAX_VERTEX_SAMPLERS); /* textures */
--
-+#if HAVE_LLVM >= 0x0300
-+ context_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(context_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- context_type = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, struct_name, context_type);
-
- LLVMInvalidateStructLayout(gallivm->target, context_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants,
- target, context_type, 0);
-@@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_state *gallivm,
- * Create LLVM type for struct pipe_vertex_buffer
- */
- static LLVMTypeRef
--create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
-+create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name)
- {
- LLVMTargetDataRef target = gallivm->target;
- LLVMTypeRef elem_types[3];
-@@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
- elem_types[1] = LLVMInt32TypeInContext(gallivm->context);
- elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */
-
-+#if HAVE_LLVM >= 0x0300
-+ vb_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(vb_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- vb_type = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, struct_name, vb_type);
-
- LLVMInvalidateStructLayout(gallivm->target, vb_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride,
- target, vb_type, 0);
-@@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
- elem_types[1] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
- elem_types[2] = LLVMArrayType(elem_types[1], data_elems);
-
-+#if HAVE_LLVM >= 0x0300
-+ vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(vertex_header, elem_types,
-+ Elements(elem_types), 0);
-+#else
- vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
-
- LLVMInvalidateStructLayout(gallivm->target, vertex_header);
-+#endif
-
- /* these are bit-fields and we can't take address of them
- LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask,
-@@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
- target, vertex_header,
- DRAW_JIT_VERTEX_DATA);
-
-- LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
--
- return vertex_header;
- }
-
-@@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm)
- struct gallivm_state *gallivm = llvm->gallivm;
- LLVMTypeRef texture_type, context_type, buffer_type, vb_type;
-
-- texture_type = create_jit_texture_type(gallivm);
-- LLVMAddTypeName(gallivm->module, "texture", texture_type);
-+ texture_type = create_jit_texture_type(gallivm, "texture");
-
-- context_type = create_jit_context_type(gallivm, texture_type);
-- LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type);
-+ context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context");
- llvm->context_ptr_type = LLVMPointerType(context_type, 0);
-
- buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0);
-- LLVMAddTypeName(gallivm->module, "buffer", buffer_type);
- llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0);
-
-- vb_type = create_jit_vertex_buffer_type(gallivm);
-- LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type);
-+ vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer");
- llvm->vb_ptr_type = LLVMPointerType(vb_type, 0);
- }
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index 8636cd6..f44749d 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -27,17 +27,23 @@
-
- #include <llvm-c/Core.h>
- #include <llvm/Target/TargetMachine.h>
--#include <llvm/Target/TargetRegistry.h>
--#include <llvm/Target/TargetSelect.h>
- #include <llvm/Target/TargetInstrInfo.h>
- #include <llvm/Support/raw_ostream.h>
- #include <llvm/Support/MemoryObject.h>
-
-+#if HAVE_LLVM >= 0x0300
-+#include <llvm/Support/TargetRegistry.h>
-+#include <llvm/Support/TargetSelect.h>
-+#else /* HAVE_LLVM < 0x0300 */
-+#include <llvm/Target/TargetRegistry.h>
-+#include <llvm/Target/TargetSelect.h>
-+#endif /* HAVE_LLVM < 0x0300 */
-+
- #if HAVE_LLVM >= 0x0209
- #include <llvm/Support/Host.h>
--#else
-+#else /* HAVE_LLVM < 0x0209 */
- #include <llvm/System/Host.h>
--#endif
-+#endif /* HAVE_LLVM < 0x0209 */
-
- #if HAVE_LLVM >= 0x0207
- #include <llvm/MC/MCDisassembler.h>
-@@ -193,14 +199,23 @@ lp_disassemble(const void* func)
-
- InitializeAllDisassemblers();
-
-+#if HAVE_LLVM >= 0x0300
-+ OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
-+#else
- OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));
-+#endif
-
- if (!AsmInfo) {
- debug_printf("error: no assembly info for target %s\n", Triple.c_str());
- return;
- }
-
-+#if HAVE_LLVM >= 0x0300
-+ const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), "");
-+ OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI));
-+#else
- OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler());
-+#endif
- if (!DisAsm) {
- debug_printf("error: no disassembler for target %s\n", Triple.c_str());
- return;
-@@ -213,7 +228,11 @@ lp_disassemble(const void* func)
- #else
- int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
--#if HAVE_LLVM >= 0x0208
-+
-+#if HAVE_LLVM >= 0x0300
-+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
-+#elif HAVE_LLVM >= 0x0208
- OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo));
- #else
-@@ -253,7 +272,11 @@ lp_disassemble(const void* func)
-
- if (!DisAsm->getInstruction(Inst, Size, memoryObject,
- pc,
-- nulls())) {
-+#if HAVE_LLVM >= 0x0300
-+ nulls(), nulls())) {
-+#else
-+ nulls())) {
-+#endif
- debug_printf("invalid\n");
- pc += 1;
- }
-@@ -276,7 +299,9 @@ lp_disassemble(const void* func)
- * Print the instruction.
- */
-
--#if HAVE_LLVM >= 0x208
-+#if HAVE_LLVM >= 0x0300
-+ Printer->printInst(&Inst, Out, "");
-+#elif HAVE_LLVM >= 0x208
- Printer->printInst(&Inst, Out);
- #else
- Printer->printInst(&Inst);
-@@ -289,7 +314,11 @@ lp_disassemble(const void* func)
-
- pc += Size;
-
-+#if HAVE_LLVM >= 0x0300
-+ const MCInstrDesc &TID = TII->get(Inst.getOpcode());
-+#else
- const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
-+#endif
-
- /*
- * Keep track of forward jumps to a nearby address.
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.c b/src/gallium/auxiliary/gallivm/lp_bld_type.c
-index c5cf6d4..efd159f 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_type.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c
-@@ -325,16 +325,18 @@ lp_typekind_name(LLVMTypeKind t)
- return "LLVMArrayTypeKind";
- case LLVMPointerTypeKind:
- return "LLVMPointerTypeKind";
-+#if HAVE_LLVM < 0x0300
- case LLVMOpaqueTypeKind:
- return "LLVMOpaqueTypeKind";
-+#endif
- case LLVMVectorTypeKind:
- return "LLVMVectorTypeKind";
- case LLVMMetadataTypeKind:
- return "LLVMMetadataTypeKind";
-- /* Only in LLVM 2.7 and later???
-+#if HAVE_LLVM == 0x0207
- case LLVMUnionTypeKind:
- return "LLVMUnionTypeKind";
-- */
-+#endif
- default:
- return "unknown LLVMTypeKind";
- }
-diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c
-index 268f0fa..ce92a80 100644
---- a/src/gallium/drivers/llvmpipe/lp_jit.c
-+++ b/src/gallium/drivers/llvmpipe/lp_jit.c
-@@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- elem_types[LP_JIT_TEXTURE_BORDER_COLOR] =
- LLVMArrayType(LLVMFloatTypeInContext(lc), 4);
-
-+#if HAVE_LLVM >= 0x0300
-+ texture_type = LLVMStructCreateNamed(gallivm->context, "texture");
-+ LLVMStructSetBody(texture_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- texture_type = LLVMStructTypeInContext(lc, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, "texture", texture_type);
-
- LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width,
- gallivm->target, texture_type,
-@@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-
- LP_CHECK_STRUCT_SIZE(struct lp_jit_texture,
- gallivm->target, texture_type);
--
-- LLVMAddTypeName(gallivm->module, "texture", texture_type);
- }
-
- /* struct lp_jit_context */
-@@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type,
- PIPE_MAX_SAMPLERS);
-
-+#if HAVE_LLVM >= 0x0300
-+ context_type = LLVMStructCreateNamed(gallivm->context, "context");
-+ LLVMStructSetBody(context_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- context_type = LLVMStructTypeInContext(lc, elem_types,
- Elements(elem_types), 0);
-
- LLVMInvalidateStructLayout(gallivm->target, context_type);
-
-+ LLVMAddTypeName(gallivm->module, "context", context_type);
-+#endif
-+
- LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants,
- gallivm->target, context_type,
- LP_JIT_CTX_CONSTANTS);
-@@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- LP_CHECK_STRUCT_SIZE(struct lp_jit_context,
- gallivm->target, context_type);
-
-- LLVMAddTypeName(gallivm->module, "context", context_type);
--
- lp->jit_context_ptr_type = LLVMPointerType(context_type, 0);
- }
-
diff --git a/multilib-testing/lib32-util-linux/PKGBUILD b/multilib-testing/lib32-util-linux/PKGBUILD
deleted file mode 100644
index aeb1cbc80..000000000
--- a/multilib-testing/lib32-util-linux/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 66417 2012-02-24 16:16:14Z dreisner $
-# Maintainer: judd <jvinet@zeroflux.org>
-
-_pkgbasename=util-linux
-pkgname=lib32-$_pkgbasename
-pkgver=2.21
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
-url='http://www.kernel.org/pub/linux/utils/util-linux/'
-arch=('x86_64')
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-provides=('lib32-util-linux-ng')
-conflicts=('lib32-util-linux-ng')
-replaces=('lib32-util-linux-ng')
-license=('GPL2')
-options=('!libtool' '!emptydirs')
-source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/util-linux-$pkgver.tar.xz")
-md5sums=('208aa058f4117759d2939d1be7d662fc')
-
-shopt -s extglob
-
-build() {
- cd "$srcdir/$_pkgbasename-$pkgver"
-
- export CC="gcc -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- ./autogen.sh
- ./configure --without-ncurses --libdir=/usr/lib32
-
- for lib in lib{mount,blkid,uuid}; do
- make -C "$lib"
- done
-}
-
-package() {
- cd "$srcdir/$_pkgbasename-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # remove everything but libs
- rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32)
-}