diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-03-28 07:44:56 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-03-28 07:44:56 +0000 |
| commit | db7b88eb8272c09de07dc1d21f6489cfcb60270f (patch) | |
| tree | c23a0528da763d075b35a48b0d84576f6fe9c597 | |
| parent | 1037775d3e2c6877d569424666f3a4106b27923b (diff) | |
| download | multilib-db7b88eb8272c09de07dc1d21f6489cfcb60270f.tar.gz multilib-db7b88eb8272c09de07dc1d21f6489cfcb60270f.tar.xz | |
Fix for segfault issues people were experiencing
| -rwxr-xr-x | 14.0/glibc/glibc-multilib.SlackBuild | 4 | ||||
| -rwxr-xr-x | 14.1/glibc/glibc-multilib.SlackBuild | 4 | ||||
| -rwxr-xr-x | current/glibc/glibc-multilib.SlackBuild | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/14.0/glibc/glibc-multilib.SlackBuild b/14.0/glibc/glibc-multilib.SlackBuild index d5d426e..4b44e34 100755 --- a/14.0/glibc/glibc-multilib.SlackBuild +++ b/14.0/glibc/glibc-multilib.SlackBuild @@ -30,7 +30,7 @@ VERSION=${VERSION:-2.15} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-1alien} +BUILD=${BUILD:-2alien} ## Included in glibc now: ## glibc-libidn version @@ -199,6 +199,8 @@ apply_patches() { zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1 # Upstream fixes to avert Firefox crashes: (still applies to 2.15... probably better not to drop it) zcat $CWD/glibc-2.14.1-fixes-1.patch.gz | patch -p1 --verbose || exit 1 + # Upstream patch to fix relocation sorting related crashes: + zcat $CWD/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff.gz | patch -p1 --verbose || exit 1 if [ $BOOTSTRP -eq 1 ] ; then # Multilib - Disable check for forced unwind (Patch from eglibc) since we # do not have a multilib glibc yet to link to; diff --git a/14.1/glibc/glibc-multilib.SlackBuild b/14.1/glibc/glibc-multilib.SlackBuild index d5d426e..4b44e34 100755 --- a/14.1/glibc/glibc-multilib.SlackBuild +++ b/14.1/glibc/glibc-multilib.SlackBuild @@ -30,7 +30,7 @@ VERSION=${VERSION:-2.15} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-1alien} +BUILD=${BUILD:-2alien} ## Included in glibc now: ## glibc-libidn version @@ -199,6 +199,8 @@ apply_patches() { zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1 # Upstream fixes to avert Firefox crashes: (still applies to 2.15... probably better not to drop it) zcat $CWD/glibc-2.14.1-fixes-1.patch.gz | patch -p1 --verbose || exit 1 + # Upstream patch to fix relocation sorting related crashes: + zcat $CWD/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff.gz | patch -p1 --verbose || exit 1 if [ $BOOTSTRP -eq 1 ] ; then # Multilib - Disable check for forced unwind (Patch from eglibc) since we # do not have a multilib glibc yet to link to; diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild index d5d426e..4b44e34 100755 --- a/current/glibc/glibc-multilib.SlackBuild +++ b/current/glibc/glibc-multilib.SlackBuild @@ -30,7 +30,7 @@ VERSION=${VERSION:-2.15} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-1alien} +BUILD=${BUILD:-2alien} ## Included in glibc now: ## glibc-libidn version @@ -199,6 +199,8 @@ apply_patches() { zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1 # Upstream fixes to avert Firefox crashes: (still applies to 2.15... probably better not to drop it) zcat $CWD/glibc-2.14.1-fixes-1.patch.gz | patch -p1 --verbose || exit 1 + # Upstream patch to fix relocation sorting related crashes: + zcat $CWD/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff.gz | patch -p1 --verbose || exit 1 if [ $BOOTSTRP -eq 1 ] ; then # Multilib - Disable check for forced unwind (Patch from eglibc) since we # do not have a multilib glibc yet to link to; |