Browse Source

Changed the pattern to find the pure64 or multilib patches

- The formely pattern used $pkg-$ver, which turned out to be
  a bit too strict.
karasz/new-early
Christian Wiese 17 years ago
parent
commit
c398fa8948
2 changed files with 22 additions and 7 deletions
  1. +6
    -5
      architecture/x86-64/pkg_gcc_post.conf
  2. +16
    -2
      architecture/x86-64/pkg_glibc_post.conf

+ 6
- 5
architecture/x86-64/pkg_gcc_post.conf

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: architecture/x86-64/pkg_gcc_post.conf
# Filename: architecture/x86-64/pkg_gcc_post.conf
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -10,7 +11,7 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---
# --- SDE-COPYRIGHT-NOTE-END ---
emulation_arch="`echo $arch_target | sed -e 's/[-_]*64//' -e 's/x86/i386/'`" emulation_arch="`echo $arch_target | sed -e 's/[-_]*64//' -e 's/x86/i386/'`"
gcc_amd64_postmake() { gcc_amd64_postmake() {
@ -28,10 +29,10 @@ gcc_amd64_postmake() {
} }
if [ "$SDECFG_MULTILIB" = 1 ]; then if [ "$SDECFG_MULTILIB" = 1 ]; then
var_append patchfiles ' ' "$confdir/$pkg-$ver*multilib*.diff"
var_append patchfiles ' ' "$confdir/*multilib*.diff"
hook_add postmake 5 "gcc_amd64_postmake" hook_add postmake 5 "gcc_amd64_postmake"
else else
var_append patchfiles ' ' "$confdir/$pkg-$ver*pure64*.diff"
var_append patchfiles ' ' "$confdir/*pure64*.diff"
fi fi

+ 16
- 2
architecture/x86-64/pkg_glibc_post.conf

@ -1,3 +1,17 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: architecture/x86-64/pkg_glibc_post.conf
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
pkg_glibc32_preconf(){ pkg_glibc32_preconf(){
if [ $buildloop -eq 1 ]; then if [ $buildloop -eq 1 ]; then
# after finishing buildloop 1 we have to get back to the # after finishing buildloop 1 we have to get back to the
@ -31,9 +45,9 @@ EOT
} }
if [ "$SDECFG_MULTILIB" != 1 ]; then if [ "$SDECFG_MULTILIB" != 1 ]; then
var_append patchfiles ' ' "$confdir/$pkg-$ver*pure64*.diff"
var_append patchfiles ' ' "$confdir/*pure64*.diff"
else else
var_append patchfiles ' ' "$confdir/$pkg-$ver*multilib*.diff"
var_append patchfiles ' ' "$confdir/*multilib*.diff"
if ! atstage toolchain; then if ! atstage toolchain; then
buildloops=2 buildloops=2

Loading…
Cancel
Save