Commit 79765211 authored by Andrew Manison's avatar Andrew Manison

Merge remote branch 'alpine/master'; fixes for build problems.

Conflicts:
	main/abuild/APKBUILD
parents 00630fd7 2da022a8
......@@ -2,13 +2,27 @@
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
pkgver=2.3
pkgrel=0
pkgrel=1
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2"
depends="fakeroot file sudo pax-utils apk-tools"
source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
abuild-conflict-message.patch
"
depends="fakeroot file sudo pax-utils openssl apk-tools"
makedepends="openssl-dev pkgconfig"
license=GPL-2
prepare() {
cd "$srcdir/$pkgname-$pkgver"
for i in $source; do
case $i in
*.patch)
msg "Applying $i"
patch -p1 -i "$srcdir"/$i || return 1
;;
esac
done
}
build() {
cd "$srcdir/$pkgname-$pkgver"
make
......@@ -19,4 +33,6 @@ package() {
make install DESTDIR="$pkgdir"
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
}
md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2"
md5sums="7c738e0018202160366b8329ec693502 abuild-2.3.tar.bz2
45ee7aa6e00732a8c36d7740fb8d2aeb abuild-conflict-message.patch"
commit c30c346362223658980275d54d5b7911a3a7486c
Author: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed Jun 30 14:59:07 2010 +0000
abuild: detect and report conflicting dependencies properly
diff --git a/abuild.in b/abuild.in
index 0c94653..4034a86 100755
--- a/abuild.in
+++ b/abuild.in
@@ -841,15 +841,16 @@ builddeps() {
# find which deps are missing
for i in $deps; do
if [ "${i#\!}" != "$i" ]; then
- list_has ${i#\!} $installed_deps \
+ $APK info -q -e "${i#\!}" \
&& conflicts="$conflicts ${i#\!}"
elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then
missing="$missing $i"
fi
done
-
+
if [ -n "$conflicts" ]; then
- die "Conflicting package(s) installed:$conflics"
+ error "Conflicting package(s) installed:$conflicts"
+ return 1
fi
if [ -z "$install_deps" ] && [ -z "$recursive" ]; then
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.0.5
pkgrel=0
pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
apk-tools-static.patch
"
url="http://git.alpinelinux.org/cgit/apk-tools/"
......@@ -21,6 +22,9 @@ prepare() {
*.patch) patch -p1 -i "$srcdir"/$i || return 1
esac
done
# the patch includes a symlink
rm -f src/apk-static.c
ln -s apk.c src/apk-static.c
}
build() {
......@@ -49,4 +53,5 @@ static() {
}
md5sums="7f9234ab210557b064d7bd9b42833f0a apk-tools-2.0.5.tar.bz2
f63d483b724e8e9344ce8cb965d5ed22 0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch"
f63d483b724e8e9344ce8cb965d5ed22 0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
3c1f21719a6c4aba51333cf0d88c5600 apk-tools-static.patch"
commit dd6008995a8e8509d71ffa906c837e7a320e8a15
Author: Timo Teräs <timo.teras@iki.fi>
Date: Wed Jun 30 16:53:56 2010 +0300
static build: do not use openssl engines
We want minimal static build. And this now also breaks with our openssl
since it tries to automatically dlopen some of the engine modules.
diff --git a/.gitignore b/.gitignore
index f6f9cf6..2b22f52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
apk
+apk.static
*.o
*.d
*.cmd
diff --git a/src/Makefile b/src/Makefile
index bea288e..c9cda6a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,9 +41,10 @@ endif
CFLAGS_ALL += -D_ATFILE_SOURCE
CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
+CFLAGS_apk-static.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE
progs-$(STATIC) += apk.static
-apk.static-objs := $(apk-objs)
+apk.static-objs := $(filter-out apk.o,$(apk-objs)) apk-static.o
LDFLAGS_apk.static := -static
LDFLAGS_apk += -nopie -L$(obj)
diff --git a/src/apk-static.c b/src/apk-static.c
new file mode 120000
index 0000000..bf745af
--- /dev/null
+++ b/src/apk-static.c
@@ -0,0 +1 @@
+apk.c
\ No newline at end of file
diff --git a/src/apk.c b/src/apk.c
index 81bb950..4196f74 100644
--- a/src/apk.c
+++ b/src/apk.c
@@ -12,13 +12,17 @@
#include <stdio.h>
#include <fcntl.h>
#include <ctype.h>
+#include <errno.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
#include <sys/stat.h>
+#include <openssl/crypto.h>
+#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
+#endif
#include "apk_defines.h"
#include "apk_database.h"
......@@ -7,7 +7,7 @@ url="http://apr.apache.org/"
license="APACHE"
depends=
subpackages="$pkgname-dev"
makedepends="apr-dev expat-dev e2fsprogs-dev"
makedepends="apr-dev expat-dev e2fsprogs-dev bash"
source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
build() {
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
pkgver=2.8.1
pkgrel=1
pkgver=2.8.2
pkgrel=0
pkgdesc="CMake is a cross-platform open-source make system"
url="http://www.cmake.org"
license="CMake"
......@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
md5sums="a92ad653f9ccc1595d16cd9707f49acc cmake-2.8.1.tar.gz"
md5sums="8c967d5264657a798f22ee23976ff0d9 cmake-2.8.2.tar.gz"
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Mason <ms13sp@gmail.com>
pkgname=cracklib
pkgver=2.8.13
pkgrel=1
pkgver=2.8.16
pkgrel=0
pkgdesc="A library used to enforce strong passwords"
url="http://sourceforge.net/projects/cracklib"
license="GPL"
......@@ -11,7 +11,14 @@ makedepends=""
install=
subpackages="$pkgname-dev"
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
cracklib-nls.patch
"
prepare() {
cd "$srcdir"/$pkgname-$pkgver
patch -p1 -i "$srcdir"/cracklib-nls.patch
}
build() {
cd "$srcdir/$pkgname-$pkgver"
......@@ -24,8 +31,13 @@ build() {
--disable-nls \
--with-default-dict
make -j1 all || return 1
}
package() {
cd "$srcdir/$pkgname-$pkgver"
make -j1 DESTDIR="$pkgdir" install
}
md5sums="5beb4c6b3c31c83fc98c4c225b25cd94 cracklib-2.8.13.tar.gz"
md5sums="3bfb22db8fcffd019463ee415a1b25b7 cracklib-2.8.16.tar.gz
239b1b7b59bee4dee7577aa9df18ba46 cracklib-nls.patch"
--- ./util/check.c.orig
+++ ./util/check.c
@@ -22,7 +22,9 @@
int i;
setlocale(LC_ALL, "");
+#if defined(ENABLE_NLS)
textdomain(PACKAGE);
+#endif
while (fgets(buf, sizeof(buf), stdin) != NULL) {
while (((i = strlen(buf)) > 0) && (i > 0)) {
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dialog
pkgver=1.1.20100119
_ver=${pkgver%.*}-${pkgver##*.}
pkgver=1.1.20100428
_pkgver=1.1-20100428
pkgrel=1
pkgdesc="A script-interpreter which provides a set of curses"
url="http://invisible-island.net/dialog/dialog.html"
......@@ -11,10 +11,10 @@ depends=
makedepends="ncurses-dev"
install=
subpackages="$pkgname-doc"
source="ftp://invisible-island.net/dialog/$pkgname.tar.gz"
source="ftp://ftp.us.debian.org/debian/pool/main/d/$pkgname/dialog_$_pkgver.orig.tar.gz"
build() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$_pkgver"
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
......@@ -23,8 +23,8 @@ build() {
}
package() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$_pkgver"
make DESTDIR="$pkgdir" install
}
md5sums="3d62219658fdddf3c6247fb45831a5d0 dialog.tar.gz"
md5sums="519c0a0cbac28ddb992111ec2c3f82aa dialog_1.1-20100428.orig.tar.gz"
......@@ -6,12 +6,12 @@ _specsver=0.1.7
_espfver=0.3.6
_uclibc_abiver=0.9.32
pkgrel=2
pkgrel=3
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org"
license="GPL LGPL"
depends="binutils libgcc libgomp"
makedepends="bison flex gmp5-dev mpfr-dev texinfo"
makedepends="bison flex gmp-dev mpfr-dev texinfo"
subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
......@@ -21,6 +21,7 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
pt_gnu_eh_frame.patch
uclibc-getipinfo.patch
gcc-dynamic-linker.patch
PR32219.patch
"
# ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
build ()
......@@ -133,4 +134,5 @@ d51a6ec3eac1a90e7fc280d976ce7f80 gcc-g++-4.4.4.tar.bz2
c4045bfa85d8be780affd465be9d8ca8 gcc-spec-env.patch
2db1e3482c5dd59dab70f701afa2ca80 pt_gnu_eh_frame.patch
6cc2385c5bbd6d0da6eaedd53c8bf547 uclibc-getipinfo.patch
6db5c87887beee75cde3cce86625b9ed gcc-dynamic-linker.patch"
6db5c87887beee75cde3cce86625b9ed gcc-dynamic-linker.patch
6c866c7fb8d56deb8f6d652bee64e228 PR32219.patch"
From gcc-patches-return-258497-listarch-gcc-patches=gcc dot gnu dot org at gcc dot gnu dot org Tue Mar 16 13:32:55 2010
Return-Path: <gcc-patches-return-258497-listarch-gcc-patches=gcc dot gnu dot org at gcc dot gnu dot org>
Delivered-To: listarch-gcc-patches at gcc dot gnu dot org
Received: (qmail 25550 invoked by alias); 16 Mar 2010 13:32:54 -0000
Received: (qmail 25534 invoked by uid 22791); 16 Mar 2010 13:32:53 -0000
X-SWARE-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL,BAYES_00,SUBJ_ALL_CAPS
X-Spam-Check-By: sourceware.org
Received: from mail-bw0-f210.google.com (HELO mail-bw0-f210.google.com) (209.85.218.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 16 Mar 2010 13:32:48 +0000
Received: by bwz2 with SMTP id 2so4002140bwz.30 for <multiple recipients>; Tue, 16 Mar 2010 06:32:45 -0700 (PDT)
Received: by 10.204.14.84 with SMTP id f20mr2900449bka.209.1268746365293; Tue, 16 Mar 2010 06:32:45 -0700 (PDT)
Received: from s42.loc (85-127-85-230.dynamic.xdsl-line.inode.at [85.127.85.230]) by mx.google.com with ESMTPS id 14sm3626793bwz.14.2010.03.16.06.32.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 16 Mar 2010 06:32:44 -0700 (PDT)
Received: from cow by s42.loc with local (Exim 4.71) (envelope-from <rep.dot.nop@gmail.com>) id 1NrX2W-0008Nj-5o; Tue, 16 Mar 2010 14:42:32 +0100
From: Bernhard Reutner-Fischer <rep dot dot dot nop at gmail dot com>
To: gcc-patches at gcc dot gnu dot org
Cc: rguenth at gcc dot gnu dot org, Bernhard Reutner-Fischer <rep dot dot dot nop at gmail dot com>
Subject: [PATCH] PR32219
Date: Tue, 16 Mar 2010 14:42:27 +0100
Message-Id: <1268746947-32108-1-git-send-email-rep.dot.nop@gmail.com>
Mailing-List: contact gcc-patches-help at gcc dot gnu dot org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches at gcc dot gnu dot org>
List-Help: <mailto:gcc-patches-help at gcc dot gnu dot org>
Sender: gcc-patches-owner at gcc dot gnu dot org
Delivered-To: mailing list gcc-patches at gcc dot gnu dot org
Hi,
As suggested by richi.
regtested on i686-linux-gnu with all default languages and no regressions.
Ok for trunk?
gcc/ChangeLog
2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
PR target/32219
* varasm.c (default_binds_local_p_1): Weak data is not local.
gcc/testsuite/ChangeLog
2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
PR target/32219
* gcc.dg/visibility-21.c: New test.
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
gcc/testsuite/gcc.dg/visibility-21.c | 14 ++++++++++++++
gcc/varasm.c | 8 ++++----
2 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/visibility-21.c
diff --git a/gcc/testsuite/gcc.dg/visibility-21.c b/gcc/testsuite/gcc.dg/visibility-21.c
new file mode 100644
index 0000000..be7deda
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/visibility-21.c
@@ -0,0 +1,14 @@
+/* PR target/32219 */
+/* { dg-do run } */
+/* { dg-require-visibility "" } */
+/* { dg-options "-fPIC" { target fpic } } */
+
+extern void f() __attribute__((weak,visibility("hidden")));
+extern int puts( char const* );
+int main()
+{
+ if (f)
+ f();
+ return 0;
+}
+
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 6b8222f..6b9269a 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -6613,6 +6613,10 @@ default_binds_local_p_1 (const_tree exp, int shlib)
/* Static variables are always local. */
else if (! TREE_PUBLIC (exp))
local_p = true;
+ /* Weak data can be overridden by a strong symbol
+ in another module and so are not local. */
+ else if (DECL_WEAK (exp))
+ local_p = false;
/* A variable is local if the user has said explicitly that it will
be. */
else if (DECL_VISIBILITY_SPECIFIED (exp)
@@ -6625,10 +6629,6 @@ default_binds_local_p_1 (const_tree exp, int shlib)
local. */
else if (DECL_VISIBILITY (exp) != VISIBILITY_DEFAULT)
local_p = true;
- /* Default visibility weak data can be overridden by a strong symbol
- in another module and so are not local. */
- else if (DECL_WEAK (exp))
- local_p = false;
/* If PIC, then assume that any global name can be overridden by
symbols resolved from other modules, unless we are compiling with
-fwhole-program, which assumes that names are local. */
--
1.7.0
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=git
pkgver=1.7.1
pkgrel=2
pkgver=1.7.1.1
pkgrel=0
pkgdesc="GIT - the stupid content tracker"
url="http://git.or.cz/"
license="GPL2"
......@@ -10,7 +10,6 @@ subpackages="$pkgname-doc $pkgname-perl"
makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev"
source="http://kernel.org/pub/software/scm/git/git-$pkgver.tar.bz2
bb-tar.patch
git-do-not-dump-core-when-iconv-fails.patch
"
_makeopts="NO_ICONV=YesPlease
......@@ -21,8 +20,6 @@ _makeopts="NO_ICONV=YesPlease
build() {
cd "$srcdir"/$pkgname-$pkgver
patch -p1 -i "$srcdir"/bb-tar.patch || return 1
patch -p1 -i "$srcdir"/git-do-not-dump-core-when-iconv-fails.patch \
|| return 1
make prefix=/usr DESTDIR="$pkgdir" $_makeopts || return 1
}
......@@ -45,6 +42,5 @@ perl() {
}
md5sums="3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2
e63a201556c4f089de790805c09a2e5b bb-tar.patch
7c660517316261b383a094ef03aad0aa git-do-not-dump-core-when-iconv-fails.patch"
md5sums="1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2
e63a201556c4f089de790805c09a2e5b bb-tar.patch"
commit 43acff34b902c38808ac0f326090f2516250e1f0
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat May 8 18:17:29 2010 -0500
cherry-pick: do not dump core when iconv fails
When cherry-picking, usually the new and old commit encodings are both
UTF-8. Most old iconv implementations do not support this trivial
conversion, so on old platforms, out->message remains NULL, and later
attempts to read it segfault.
Fix this by noticing the input and output encodings match and skipping
the iconv step, like the other reencode_string() call sites already do.
Also stop segfaulting on other iconv failures: if iconv fails for some
other reason, the best we can do is to pass the old message through.
This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert:
clarify label on conflict hunks, 2010-03-20).
Reported-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/revert.c b/builtin/revert.c
index 778a56e..7d68ef7 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out)
encoding = "UTF-8";
if (!git_commit_encoding)
git_commit_encoding = "UTF-8";
- if ((out->reencoded_message = reencode_string(raw_message,
- git_commit_encoding, encoding)))
+
+ out->reencoded_message = NULL;
+ out->message = raw_message;
+ if (strcmp(encoding, git_commit_encoding))
+ out->reencoded_message = reencode_string(raw_message,
+ git_commit_encoding, encoding);
+ if (out->reencoded_message)
out->message = out->reencoded_message;
abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gmp
pkgver=4.3.2
pkgrel=1
pkgdesc="A free library for arbitrary precision arithmetic"
url="http://gmplib.org/"
license="LGPL3"
makedepends="m4 texinfo"
depends=
subpackages="$pkgname-doc $pkgname-dev"
source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2
gmp-4.1.4-noexecstack.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
build() {
cd "$_builddir"
patch -p1 < ../gmp-4.1.4-noexecstack.patch || return 1
ABI="32" ./configure --prefix=/usr \
--build=${CHOST} \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
--localstatedir=/var/state/gmp \
--disable-mpfr \
--disable-mpbsd \
--disable-cxx \
--with-pic \
|| return 1
make || return 1
}
package() {
cd "$_builddir"
make -j1 DESTDIR="${pkgdir}" install || return 1
}
md5sums="dd60683d7057917e34630b4a787932e8 gmp-4.3.2.tar.bz2
13c34f00e77ded6673270cfea06c35c3 gmp-4.1.4-noexecstack.patch"
fixed executable stack
http://bugs.gentoo.org/115038
--- gmp-4.1.4/configure
+++ gmp-4.1.4/configure
@@ -21689,6 +21689,13 @@
fi
echo "')" >> $gmp_configm4
echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
+# Gentoo hack
+case $host_os in
+ *linux*)
+ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4
+ echo '.previous' >> $gmp_configm4
+ ;;
+esac
# Create Makefiles
# FIXME: Upcoming version of autoconf/automake may not like broken lines.
......@@ -3,13 +3,13 @@ _name=gmp
pkgname=${_name}5
pkgver=5.0.1
pkgrel=0
pkgrel=1
pkgdesc="A free library for arbitrary precision arithmetic"
url="http://gmplib.org/"
license="LGPL3"
makedepends="m4 texinfo"
depends=
subpackages="$pkgname-doc $pkgname-dev"
subpackages="$pkgname-doc gmp-dev:dev"
source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2
gmp-4.1.4-noexecstack.patch
"
......@@ -39,7 +39,7 @@ package() {
}
dev() {
replaces="gmp"
replaces="gmp gmp5-dev"
default_dev
}
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=guile
pkgver=1.8.7
pkgrel=2
pkgrel=3
pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
url="http://www.gnu.org/software/guile/"
license="GPL"
subpackages="$pkgname-dev $pkgname-doc"
makedepends="gmp5-dev libtool ncurses-dev texinfo"
makedepends="gmp-dev libtool ncurses-dev texinfo"
depends=
install=
source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
......
......@@ -27,6 +27,7 @@ subpackages=
source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz
iscsitarget-1.4.18+linux-2.6.32.patch
"
_ksrc=/usr/src/linux-headers-${_abi_release}
prepare() {
cd "$srcdir"/$_realname-$_iscsiver
......@@ -39,14 +40,12 @@ prepare() {
build() {
cd "$srcdir"/$_realname-$_iscsiver
unset ARCH
local ksrc=/usr/src/linux-headers-${_abi_release}
make KSRC="$ksrc" kernel || return 1
make KSRC="$_ksrc" kernel || return 1
}
package() {
cd "$srcdir"/$_realname-$_iscsiver
local ksrc=/usr/src/linux-headers-${_abi_release}
make KSRC="$ksrc" DISTDIR="$pkgdir" install-kernel || return 1
make KSRC="$_ksrc" DISTDIR="$pkgdir" install-kernel || return 1
}
md5sums="9beca214c28949cce1716b49fec57de4 iscsitarget-1.4.19.tar.gz
......
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
_abiver=0.9.32
pkgname=libc$_abiver
_gitver=1006041126
_gitver=1006300816
pkgver=${_abiver}_alpha0_git$_gitver
pkgrel=1
pkgdesc="C library for developing embedded Linux systems"
......@@ -20,6 +20,7 @@ source="http://build.alpinelinux.org:8010/distfiles/$_snapfile
uclibc-libm-pic.patch
uclibc-lutimes.patch
uclibc-resolv-tls.patch
uclibc-gcc-workaround.patch
uclibcconfig.x86
uclibcconfig.i486
"
......@@ -96,10 +97,11 @@ utils() {
mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
}
md5sums="048f92606460621d9402c43417392992 libc0.9.32-0.9.32_alpha0_git1006041126.tar.bz2
md5sums="b7af86c013378888fbd345c47ad21c3a libc0.9.32-0.9.32_alpha0_git1006300816.tar.bz2
4d408f72142ce55a0754948cc9cfe447 compat-stack-guard.patch
2f9739a980be24a842c57516155c7885 uclibc-libm-pic.patch
4d0b8170e6580b47bf5775e65a6f081e uclibc-lutimes.patch
d08831b452acdeaa3037525ee617edab uclibc-resolv-tls.patch
a88b7f394c86dc7aa606c9e338e35515 uclibc-gcc-workaround.patch
e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86
e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486"
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
To: uclibc@uclibc.org
Subject: [PATCH] more workarounds for GCC PR32219