Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 18 years ago
parent
commit
98d531240a
14 changed files with 853 additions and 525 deletions
  1. +4
    -1
      package/base/glibc/config-400.in
  2. +173
    -473
      package/base/glibc/glibc.conf
  3. +1
    -1
      package/base/glibc/glibc.desc
  4. +1
    -1
      package/base/glibc/glibc26/RTLD_SINGLE_THREAD_P.patch
  5. +12
    -0
      package/base/glibc/glibc26/___ll_lock_wait.patch
  6. +0
    -10
      package/base/glibc/glibc26/fixup-cross-libc-so.patch
  7. +0
    -37
      package/base/glibc/glibc26/gcc_eh.patch.cross
  8. +441
    -0
      package/base/glibc/glibc26/glibc-2.6-cross_hacks-1.patch.diff
  9. +127
    -0
      package/base/glibc/glibc26/glibc-2.6-libgcc_eh-1.patch.cross
  10. +58
    -0
      package/base/glibc/glibc26/glibc-2.6-localedef_segfault-1.patch
  11. +2
    -2
      package/base/glibc/glibc26/semaphore_h.patch.arm
  12. +4
    -0
      package/base/glibc/glibc26/zrelrocheck.patch
  13. +29
    -0
      package/base/glibc/ld.so.conf
  14. +1
    -0
      package/base/glibc/postconfig.in

+ 4
- 1
package/base/glibc/config-400.in

@ -1,3 +1,4 @@
#!/bin/bash
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -49,8 +50,10 @@ then
ROCKCFG_PKG_GLIBC23_LINUXTHREADS 0
fi
if [ "$ROCKCFG_MULTILIB" = 1 ] ; then
pkgfork glibc $ROCKCFG_PKG_GLIBC_BRANCH-32bit stages -1-3-----9
fi
pkgfork glibc $ROCKCFG_PKG_GLIBC_BRANCH
pkgremove glibc
menu_end
fi

+ 173
- 473
package/base/glibc/glibc.conf

@ -1,4 +1,4 @@
#!/bin/bash
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -21,533 +21,233 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
forcefpic=0
pkg_glibc_version=${xpkg#glibc}
pkg_glibc_target=${arch_target}
pkg_glibc_host="$arch_target"
pkg_glibc_cross=""
pkg_glibc_headers_only=0
pkg_glibc_cc=""
if [ "$ROCKCFG_MULTILIB" = 1 ] ; then
if [[ "$xpkg" = *-32bit ]] ; then
pkg_glibc_cc="$BUILD32"
pkg_glibc_host="$arch_target32"
else
pkg_glibc_cc="$BUILD64"
fi
fi
prefix="usr"
set_confopt
case "$xpkg" in
glibc??-cross-*)
if [[ $xpkg = *25 ]] ; then
echo_error "Cross package not yet supported by glibc25. Use glibc23!"
exit 1
fi
if [[ $xpkg = *26 ]] ; then
echo_error "Cross package not yet supported by glibc26. Use glibc23!"
exit 1
fi
pkg_glibc_cross="${xpkg#glibc*-cross-}"
pkg_glibc_version=${pkg_glibc_version%-cross-*}
pkg_glibc_target="${pkg_glibc_cross}-unknown-linux-gnu"
echo_status "Preparing to build a cross-glibc package for $pkg_glibc_cross."
pkg_glibc_cross="${xpkg#glibc*-cross-}"
pkg_glibc_version=${pkg_glibc_version%-cross-*}
pkg_glibc_host="${pkg_glibc_cross}-unknown-linux-gnu"
prefix="$prefix/$pkg_glibc_host"
set_confopt
echo_status "Preparing to build a cross-glibc package for $pkg_glibc_cross."
;;
glibc??)
glibc??|glibc??-32bit)
pkg_glibc_version=${pkg_glibc_version%-??bit}
;;
*)
echo_error "Not supported $pkg package name: $xpkg"
exit 1
false
;;
esac
pkg_glibc_linuxthreads=1
[ "$ROCKCFG_PKG_GLIBC23_LINUXTHREADS" = "0" ] && pkg_glibc_linuxthreads=0
# fall back to linuxthreads for cross glibcs
[ -n "$pkg_glibc_cross" ] && pkg_glibc_linuxthreads=1
[ "${pkg_glibc_version}" = "25" -o "${pkg_glibc_version}" = "26" ] && pkg_glibc_linuxthreads=0
# Give a more descriptive error message than the one that would happen during the build.
kernel_mainline="`uname -r | cut -f-2 -d'.'`"
if [ $pkg_glibc_linuxthreads = 0 -a "$kernel_mainline" != "2.6" ] ; then
echo_error 'You are running a kernel of the $kernel_mainline series.'
echo_error 'Glibc with NPTL support cannot be built on $kernel_mainline kernels.'
echo_error 'Boot a 2.6 kernel to build Glibc with NPTL support or build Glibc'
echo_error 'with old threading support (linuxthreads) instead.'
abort
fi
#---------------------------------
if [ $pkg_glibc_version = 22 ]; then
glibc_custmain() {
cat > configparms <<- EOF
prefix = /usr
slibdir = /lib
sysconfdir = /etc
install_root = $root
CC = $CC
BUILD_CC = $BUILDCC
AR = $AR
RANLIB = $RANLIB
EOF
# Disable glibc internal debuging but build debuging and profile
# code so we can use this glibc to debug other programs.
CFLAGS="$CFLAGS -g -DNDEBUG=1" ./configure --with-gnu-binutils \
--enable-add-ons --enable-profile \
--with-headers=$root/usr/include \
--with-gd=/usr \
--with-gd-lib=/usr/lib \
--with-gd-include=/usr/include \
--build=${arch_build} ${arch_target}
echo $BUILDCC elf/sln.c -o elf/dyn_sln
$BUILDCC elf/sln.c -o elf/dyn_sln
eval $MAKE symbolic-link-prog=elf/dyn_sln all install
# Misc. stuff
#
if [ "$crossnative" = native ] ; then
[ $stagelevel -gt 1 ] && eval $MAKE install-locales -C localedata
# otherwise we risk the hosts /usr/lib/locale/locale-archive being overwritten
mkdir -p $root/usr/share/man/man3
if [ -f /usr/bin/perl ] ; then
eval $MAKE -C linuxthreads/man \
MANDIR=$root/usr/share/man/man3 all install
fi
fi
ln -sf libbsd-compat.a $root/usr/lib/libbsd.a
# copy linuxthreads and crypt documentation
#
cp linuxthreads/ChangeLog $docdir/ChangeLog.threads
cp linuxthreads/Changes $docdir/Changes.threads
cp linuxthreads/README $docdir/README.threads
cp linuxthreads/FAQ.html $docdir/FAQ-threads.html
cp -r linuxthreads/Examples $docdir/examples.threads
cp crypt/README.ufc-crypt $docdir/README.crypt
# NSCD Init script and config
#
cp $confdir/nscd.conf $confdir/nsswitch.conf $root/etc/
install_init nscd $confdir/nscd.init
# No absolute path in libc.so if cross-compileing
#
if [ $crossnative = cross ] ; then
libcso=$root/usr/lib/libc.so
for x in 1 2 3 4 5 ; do
sed -i 's,/[a-z/]*/,,' $libcso
done
fi
# Install ld.so.conf
#
{
echo "/usr/lib"
echo "/usr/X11/lib"
echo "/usr/local/lib"
echo "/opt/*/lib"
} > $root/etc/ld.so.conf
if [ -f $root/usr/sbin/ldconfig ] ; then
ln -sf ../usr/sbin/ldconfig $root/sbin/
fi
}
patchfiles="`ls $confdir/glibc$pkg_glibc_version/*.patch \
$confdir/glibc$pkg_glibc_version/*.patch.$arch 2>/dev/null | tr '\n' ' '` $patchfiles"
if [ $stagelevel -le 2 ]; then
patchfiles="`ls $patchfiles $confdir/glibc$pkg_glibc_version/*.patch.cross \
$confdir/glibc$pkg_glibc_version/*.patch.cross.$arch 2>/dev/null | tr '\n' ' '`"
fi
#---------------------------------
#---------------------------------
if [ $pkg_glibc_version = 23 ]; then
glibc_custmain() {
# check whether profiling is enabled
if [ $ROCKCFG_PKG_GLIBC_ENABLE_PROFILE = 1 ] ; then
G_PROFILE=--enable-profile
else
G_PROFILE=--disable-profile
fi
# Let's use an 'objdir' directory for building glibc
mkdir -p objdir; cd objdir
# NPTL doesn't work with plain i386 CPUs
if [ $pkg_glibc_linuxthreads = 1 ]; then
temp_arch_target="$arch_target"
temp_arch_build="$arch_build"
configure_without_tls="--without-tls"
else
temp_arch_target="${arch_target/i386/i486}"
temp_arch_build="${arch_build/i386/i486}"
configure_without_tls=""
fi
# Disable glibc internal debuging but build debuging and profile
# code so we can use this glibc to debug other programs.
create_config_cache >> config.cache
CFLAGS="$CFLAGS -g -DNDEBUG=1" ../configure --prefix=$root/$prefix \
--with-gnu-binutils --enable-add-ons"$ADDONS" $G_PROFILE \
--with-headers=$root/$prefix/include --with-gd=/$prefix \
--with-gd-lib=/$prefix/lib --with-gd-include=/$prefix/include \
$configure_without_tls --cache-file=config.cache \
--build=${temp_arch_build} --host=${temp_arch_target}
eval $MAKE prefix=/usr slibdir=/lib sysconfdir=/etc all
if [ -z "$pkg_glibc_cross" ]
then
eval $MAKE prefix=/$prefix slibdir=/lib \
sysconfdir=/etc install_root=$root install
else
eval $MAKE prefix=/$prefix install_root=$root install
fi
ln -sf libbsd-compat.a $root/$prefix/lib/libbsd.a
# install locales
#
if [ $stagelevel -gt 1 ] ; then
# otherwise we risk the hosts /usr/lib/locale/locale-archive being overwritten
eval $MAKE localedata/install-locales
cp ../localedata/SUPPORTED $root/usr/share/i18n/
fi
# copy crypt documentation
#
cp ../crypt/README.ufc-crypt $docdir/README.crypt
configscript="../glibc-*/configure"
if [ $stagelevel -eq 0 ] ; then
pkg_glibc_headers_only=1
# NSCD Init script and config
#
cp $confdir/nscd.conf $confdir/nsswitch.conf $root/etc/
install_init nscd $confdir/nscd.init
configprefix="CC=gcc"
confopt="--prefix=/$prefix --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--with-headers=${CLFS}/$prefix/include --cache-file=config.cache"
# Misc. stuff
#
if [ $stagelevel -gt 1 -a -z "$pkg_glibc_cross" ]
then
# install linuxthread manpages
#
mkdir -p $root/usr/share/man/man3
if [ -f /usr/bin/perl -a $pkg_glibc_linuxthreads = 1 ] ; then
eval $MAKE -C ../linuxthreads/man \
MANDIR=$root/usr/share/man/man3 all install
fi
# copy linuxthreads documentation
#
if [ $pkg_glibc_linuxthreads = 1 ]; then
cp ../linuxthreads/ChangeLog $docdir/ChangeLog.threads
cp ../linuxthreads/Changes $docdir/Changes.threads
cp ../linuxthreads/README $docdir/README.threads
cp ../linuxthreads/FAQ.html $docdir/FAQ-threads.html
cp -r ../linuxthreads/Examples $docdir/examples.threads
fi
fi
# No wrong absolute path in *.so linker scripts
#
if [ -d $root/ROCK/tools.cross -a -z "$pkg_glibc_cross" ]; then
rm -f $root/ROCK/tools.cross/$arch_target/lib/libc.so
rm -f $root/ROCK/tools.cross/$arch_target/lib/libpthread.so
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libc.so > $root/ROCK/tools.cross/$arch_target/lib/libc.so
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libpthread.so > $root/ROCK/tools.cross/$arch_target/lib/libpthread.so
fi
# Install ld.so.conf
#
if [ ! -f $root/etc/ld.so.conf -a -z "$pkg_glibc_cross" ]
then
{ echo "/usr/lib" ; echo "/usr/X11/lib"
echo "/usr/local/lib" ; echo "/opt/*/lib"
} > $root/etc/ld.so.conf
makeopt=""
makeinstopt="install-headers"
else
if [ $stagelevel -eq 1 ] ; then
var_append patchfiles " " "$confdir/glibc$pkg_glibc_version/glibc-*-cross_hacks-*.patch.diff"
fi
# Move 'ldconfig' and 'sln' binaries
#
if [ -z "$pkg_glibc_cross" ]
then
if [ -f "$root/usr/sbin/ldconfig" ]; then
mv -v $root/usr/sbin/ldconfig $root/sbin/ldconfig
fi
if [ -f "$root/usr/sbin/sln" ]; then
mv -v $root/usr/sbin/sln $root/sbin/sln
fi
if [ $stagelevel -eq 1 ] ; then
export CC="${CLFS_TARGET}-gcc $pkg_glibc_cc"
export AR="${CLFS_TARGET}-ar"
export RANLIB="${CLFS_TARGET}-ranlib"
fi
# Create /lib/ld-lsb.so.1 symlink
#
if [ -z "$pkg_glibc_cross" ]
then
if [ -f $root/lib/ld-linux-$arch_machine.so.2 ]; then
ln -vfs ld-linux-$arch_machine.so.2 $root/lib/ld-lsb.so.1
elif [ -f $root/lib/ld-linux.so.2 ]; then
ln -vfs ld-linux.so.2 $root/lib/ld-lsb.so.1
fi
confopt="prefix=/$prefix --build=${CLFS_HOST} --host=$pkg_glibc_host \$extraconfopt"
var_append extraconfopt " " "--disable-profile --enable-add-ons \
--with-tls --enable-kernel=2.6.0 --with-__thread --cache-file=config.cache"
if [ $stagelevel -le 2 ] ; then
var_append extraconfopt " " "--with-binutils=${CLFS}/$cross_tools/bin \
--with-headers=${CLFS}/$prefix/include"
fi
}
makeopt=""
makeinstopt="install"
fi
#---------------------------------
#---------------------------------
if [ $pkg_glibc_version = 25 -o $pkg_glibc_version = 26 ]; then
glibc_custmain() {
# check whether profiling is enabled
if [ $ROCKCFG_PKG_GLIBC_ENABLE_PROFILE = 1 ] ; then
G_PROFILE=--enable-profile
else
G_PROFILE=--disable-profile
fi
# Let's use an 'objdir' directory for building glibc
mkdir -p objdir; cd objdir
# NPTL doesn't work with plain i386 CPUs
temp_arch_target="${arch_target/i386/i486}"
temp_arch_build="${arch_build/i386/i486}"
configure_without_tls=""
# Disable glibc internal debuging but build debuging and profile
# code so we can use this glibc to debug other programs.
create_config_cache >> config.cache
CFLAGS="$CFLAGS -g -DNDEBUG=1" ../configure --prefix=$root/$prefix \
--with-gnu-binutils --enable-add-ons"$ADDONS" $G_PROFILE \
--with-headers=$root/$prefix/include --with-gd=/$prefix \
--with-gd-lib=/$prefix/lib --with-gd-include=/$prefix/include \
$configure_without_tls --cache-file=config.cache \
--build=${temp_arch_build} --host=${temp_arch_target}
# No wrong absolute path in *.so linker scripts
# this must be called from glibc makefile right after installing usr/lib/libc.so
#
if [ -d $root/ROCK/tools.cross -a -z "$pkg_glibc_cross" ]; then
export ROCK_FIXUP_CROSS_LIBC_SO=$builddir/fixup-cross-libc-so.sh
cat << EOT > $builddir/fixup-cross-libc-so.sh
if [ -f $root/$prefix/lib/libc.so ]; then
echo "Fixing $root/ROCK/tools.cross/$arch_target/lib/libc.so."
rm -f $root/ROCK/tools.cross/$arch_target/lib/libc.so
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libc.so > $root/ROCK/tools.cross/$arch_target/lib/libc.so
fi
if [ -f $root/$prefix/lib/libpthread.so ]; then
echo "Fixing $root/ROCK/tools.cross/$arch_target/lib/libpthread.so."
rm -f $root/ROCK/tools.cross/$arch_target/lib/libpthread.so
sed 's,/[^ ]*/,,g' $root/$prefix/lib/libpthread.so > $root/ROCK/tools.cross/$arch_target/lib/libpthread.so
fi
EOT
chmod +x $builddir/fixup-cross-libc-so.sh
fi
eval $MAKE prefix=/usr slibdir=/lib sysconfdir=/etc all
eval $MAKE prefix=/$prefix slibdir=/lib \
sysconfdir=/etc install_root=$root install
ln -sf libbsd-compat.a $root/$prefix/lib/libbsd.a
$builddir/fixup-cross-libc-so.sh
# install locales
#
if [ $stagelevel -gt 1 ] ; then
# otherwise we risk the hosts /usr/lib/locale/locale-archive being overwritten
eval $MAKE localedata/install-locales
cp ../localedata/SUPPORTED $root/usr/share/i18n/
fi
# copy crypt documentation
#
cp ../crypt/README.ufc-crypt $docdir/README.crypt
if [ "$pkg_glibc_cross" ] ; then
var_insert patchfiles " " "$confdir/glibc$pkg_glibc_version/glibc-*-libgcc_eh-*.patch.cross"
# NSCD Init script and config
#
cp $confdir/nscd.conf $confdir/nsswitch.conf $root/etc/
install_init nscd $confdir/nscd.init
arch_target="$pkg_glibc_host"
arch_machine="${arch_target##-*}"
# Install ld.so.conf
#
if [ ! -f $root/etc/ld.so.conf ]
if [ -z "$( type -p $pkg_glibc_host-gcc )" ]
then
{ echo "/usr/lib" ; echo "/usr/X11/lib"
echo "/usr/local/lib" ; echo "/opt/*/lib"
} > $root/etc/ld.so.conf
fi
# Move 'ldconfig' and 'sln' binaries
#
if [ -f "$root/usr/sbin/ldconfig" ]; then
mv -v $root/usr/sbin/ldconfig $root/sbin/ldconfig
fi
if [ -f "$root/usr/sbin/sln" ]; then
mv -v $root/usr/sbin/sln $root/sbin/sln
fi
# Create /lib/ld-lsb.so.1 symlink
#
if [ -f $root/lib/ld-linux-$arch_machine.so.2 ]; then
ln -vfs ld-linux-$arch_machine.so.2 $root/lib/ld-lsb.so.1
elif [ -f $root/lib/ld-linux.so.2 ]; then
ln -vfs ld-linux.so.2 $root/lib/ld-lsb.so.1
echo_status "Building only cross-headers because there is no cross-gcc (yet)."
pkg_glibc_headers_only=1
makeinstopt="install-headers"
else
export CC=$pkg_glibc_host-gcc
export AR=$pkg_glibc_host-ar
export RANLIB=$pkg_glibc_host-ranlib
fi
}
fi
#---------------------------------
glibc_prepatch() {
if [ $pkg_glibc_linuxthreads = 1 -a -f $archdir/*linuxthreads*.tar.bz2 ]; then
tar $taropt $archdir/*linuxthreads*.tar.bz2
fi
if [ "${pkg_glibc_version}" = "25" -o "${pkg_glibc_version}" = "26" ] ; then
echo "extracting glibc-ports"
tar $taropt $archdir/glibc-ports-*.tar.bz2
hook_add prepatch 5 "glibc_prepatch"
glibc_prepatch () {
echo Extracting $archdir/glibc-ports-*.tar.bz2 ...
tar -xf $archdir/glibc-ports-*.tar.bz2
mv -v glibc-ports-* ports
if [ $stagelevel -ge 3 ] ; then
echo Extracting $archdir/glibc-libidn-*.tar.bz2 ...
tar -xf $archdir/glibc-libidn-*.tar.bz2
mv -v glibc-libidn-* libidn
fi
}
glibc_stage0() {
if [ $pkg_glibc_version = 25 -o $pkg_glibc_version = 26 ]
then
mkdir -p objdir; cd objdir
confopt="${confopt% --target=*}"
custmain="glibc_custmain"
glibc_custmain () {
if [ $pkg_glibc_headers_only = 1 ] ; then
cp configure{,.orig}
sed -e 's/3.4/3.[0-9]/g' configure.orig > configure
var_append confopt " " "--enable-add-ons"$ADDONS" --build=\$arch_build \
--host=\$arch_target"
# more configure hacks: tls support everywhere
for x in $( find .. -name configure | xargs grep libc_cv_.*_tls | \
sed -r 's,.*(libc_cv),\1,; s,(_tls).*,\1,' | sort -u; )
do eval "export $x=yes"; done
# in stage 0 we do not have the cross compiler yet.
# some configure checks which would fail without
# a working cross compiler in stage 0..
export libc_cv_mlong_double_128=yes
export libc_cv_mlong_double_128ibm=yes
export libc_cv_mabi_ibmlongdouble=yes
export libc_cv_ppc_machine=yes
# more configure hacks: tls support everywhere
for x in $( find .. -name configure | xargs grep libc_cv_.*_tls | \
sed -r 's,.*(libc_cv),\1,; s,(_tls).*,\1,' | sort -u; )
do eval "export $x=yes"; done
# due to assembler check - and we do not yet have as ...
if [ $arch = hppa ]; then
var_append confopt " " "--enable-hacker-mode"
fi
eval "../configure --enable-add-ons"$ADDONS" $confopt"
make -k cross-compiling=yes install-headers || true
cp -v ../include/features.h $root/$prefix/include
fi
if [ $pkg_glibc_version = 23 ]
then
# .cross patches don't get applied automagically if we build a -cross- pkg
# maybe add $confdir/glibc23/*.patch.${pkg_glibc_cross:0:3} to the for loop ?
if [ -n "$pkg_glibc_cross" ] ; then
for i in $confdir/glibc23/*.patch.cross
do
echo "Applying patch $i..."
patch -p1 < $i ;
done
fi
# for mips*, tries to add -mabi. for headers, we don't have a compiler allowing that yet
# if cross-compiling. the values of _MIPS_SIM can be found in sysdeps/mips/sgidefs.h
if [ \( $arch = mips -a $crossnative = cross \) -o -n "$pkg_glibc_cross" ] ; then
patch -p1 < $confdir/glibc23/no-mabi-mips64.cross.diff
mv sysdeps/mips/mips32/Makefile sysdeps/mips/mips32/Makefile-x
echo "CC += -D_MIPS_SZPTR=32 -D_MIPS_SIM=1" > sysdeps/mips/mips32/Makefile
mv sysdeps/mips/mips64/n32/Makefile sysdeps/mips/mips64/n32/Makefile-x
echo "CC += -D_MIPS_SZPTR=64 -D_MIPS_SIM=2" > sysdeps/mips/mips64/n32/Makefile
echo "long-double-fcts = yes" >> sysdeps/mips/mips64/n32/Makefile
mv sysdeps/mips/mips64/n64/Makefile sysdeps/mips/mips64/n64/Makefile-x
echo "CC += -D_MIPS_SZPTR=64 -D_MIPS_SIM=3" > sysdeps/mips/mips64/n64/Makefile
echo "long-double-fcts = yes" >> sysdeps/mips/mips64/n64/Makefile
fi
mkdir -p objdir; cd objdir
confopt="${confopt% --target=*}"
var_append confopt " " "--enable-add-ons"$ADDONS" --build=\$arch_build \
--host=\$arch_target"
mkdir -v ../objdir ; cd ../objdir
# due to assembler check - and we do not yet have as ...
[ $arch = hppa ] && var_append confopt " " "--enable-hacker-mode"
eval "../configure --enable-add-ons"$ADDONS" $confopt"
make -k cross-compiling=yes install-headers || true
cp -v ../include/features.h $root/$prefix/include
if [ $stagelevel -le 2 -o "$pkg_glibc_cross" ] ; then
echo "libc_cv_forced_unwind=yes" > config.cache
echo "libc_cv_c_cleanup=yes" >> config.cache
fi
if [ $pkg_glibc_version = 22 ]
then
eval "./configure --enable-add-ons $confopt"
make cross-compiling=yes install-headers
cp -v include/features.h $root/$prefix/include
if [ -z "$pkg_glibc_cross" ] ; then
echo "slibdir=/$multilib" >> configparms
fi
echo "install_root=$instroot" >> configparms
mkdir -p $root/$prefix/include/gnu
touch $root/$prefix/include/gnu/stubs.h
cp -v bits/stdio_lim.h $root/$prefix/include/bits
}
patchfiles="`ls $confdir/glibc$pkg_glibc_version/*.patch \
$confdir/glibc$pkg_glibc_version/*.patch.$arch 2>/dev/null | tr '\n' ' '` $patchfiles"
if [ $pkg_glibc_linuxthreads = 1 ]; then
patchfiles="`ls $confdir/glibc$pkg_glibc_version/*.patch-linuxthreads | tr '\n' ' '` $patchfiles"
fi
if [ $stagelevel -le 1 ]; then
patchfiles="`ls $patchfiles $confdir/glibc$pkg_glibc_version/*.patch.cross \
$confdir/glibc$pkg_glibc_version/*.patch.cross.$arch 2>/dev/null | tr '\n' ' '`"
fi
eval_config_command $( eval echo $confopt )
if [ $pkg_glibc_headers_only = 0 ] ; then
eval $MAKE $makeopt
fi
if [ $pkg_glibc_version = 22 ] ; then
# auto-detect for the old glibc
ADDONS=""
else
# new glibc is using NPTL per default, set to linuxthreads if needed
if [ $pkg_glibc_linuxthreads = 1 ]; then
ADDONS="=linuxthreads"
else
ADDONS=""
if [ $stagelevel -eq 3 ] ; then
make -k check 2>&1 | tee glibc-check-log
grep Error glibc-check-log || true
fi
fi
eval $MAKE $makeinstopt
threadsver="$ver"
prepatch="glibc_prepatch"
if [ $pkg_glibc_headers_only = 1 ] ; then
mkdir -p $root/$prefix/include/bits
cp -v bits/stdio_lim.h ${CLFS}/$prefix/include/bits/
mkdir -p $root/$prefix/include/gnu
touch ${CLFS}/$prefix/include/gnu/stubs.h
if [ -z "$pkg_glibc_cross" ]
then
if [ $stagelevel -eq 0 ]
then
custmain="glibc_stage0"
else
custmain="glibc_custmain"
fi
else
if [ $pkg_glibc_version = 22 ]; then
echo_error "Cross-packages are not supported for glibc22!"
exit 1
case "$arch" in
x86)
if [ "$ROCKCFG_X86_BITS" = 64 ] ; then
pkg_glibc_arch=x86_64
else
pkg_glibc_arch=i386
fi ;;
*) pkg_glibc_arch="$arch" ;;
esac
if [ -e ../glibc-*/nptl/sysdeps/unix/sysv/linux/$arch/bits/pthreadtypes.h ]
then
cp -v ../glibc-*/nptl/sysdeps/unix/sysv/linux/$arch/bits/pthreadtypes.h \
${CLFS}/$prefix/include/bits
fi
fi
arch_target="$pkg_glibc_target"
arch_machine="${arch_target/-*/}"
prefix="$prefix/$pkg_glibc_target"
set_confopt
if [[ $stagelevel -ge 1 && -z "$pkg_glibc_cross" && "$xpkg" != *-32bit ]] ; then
# make localedata/install-locales
if [ -z "$( type -p $pkg_glibc_target-gcc )" ]
then
echo_status "Building only cross-headers because there is no cross-gcc (yet)."
custmain="glibc_stage0"
else
export CC=$pkg_glibc_target-gcc
export AS=$pkg_glibc_target-as
export LD=$pkg_glibc_target-ld
export AR=$pkg_glibc_target-ar
export NM=$pkg_glibc_target-nm
export GASP=$pkg_glibc_target-gasp
export STRIP=$pkg_glibc_target-strip
export RANLIB=$pkg_glibc_target-ranlib
export CFLAGS="-O2"
custmain="glibc_custmain"
mkdir -pv ${CLFS}/usr/lib/locale
export I18NPATH=${PWD}/localedata
export GCONV_PATH=${PWD}/iconvdata
if [ $stagelevel -eq 1 ] ; then
LOCALEDEF=localedef-native
else
LOCALEDEF=localedef
fi
export LOCALEDEF="${PWD}/locale/$LOCALEDEF
--alias-file=../intl/locale.alias"
cd ../glibc-*/localedata
${LOCALEDEF} -i locales/de_DE -f charmaps/ISO-8859-1 --prefix=${CLFS} de_DE
${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 \
--prefix=${CLFS} de_DE@euro
${LOCALEDEF} -i locales/en_HK -f charmaps/ISO-8859-1 --prefix=${CLFS} en_HK
${LOCALEDEF} -i locales/en_PH -f charmaps/ISO-8859-1 --prefix=${CLFS} en_PH
${LOCALEDEF} -i locales/en_US -f charmaps/ISO-8859-1 --prefix=${CLFS} en_US
${LOCALEDEF} -i locales/es_MX -f charmaps/ISO-8859-1 --prefix=${CLFS} es_MX
${LOCALEDEF} -i locales/fa_IR -f charmaps/UTF-8 --prefix=${CLFS} fa_IR
${LOCALEDEF} -i locales/fr_FR -f charmaps/ISO-8859-1 --prefix=${CLFS} fr_FR
${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 \
--prefix=${CLFS} fr_FR@euro
${LOCALEDEF} -i locales/it_IT -f charmaps/ISO-8859-1 --prefix=${CLFS} it_IT
${LOCALEDEF} -i locales/ja_JP -f charmaps/EUC-JP --prefix=${CLFS} ja_JP
unset I18NPATH GCONV_PATH LOCALEDEF
cp -av $confdir/{ld.so,nsswitch}.conf $sysconfdir/
cp -v --remove-destination $datadir/zoneinfo/Factory \
$sysconfdir/localtime
fi
if [[ "$xpkg" = *-32bit ]] ; then
# -32bit and -64bit differ by these files, in addition to lib and lib64 dirs;
# -32bit installs:
# usr/bin/lddlibc4
# libexec/getconf/POSIX_V6_ILP32_OFF32
# libexec/getconf/POSIX_V6_ILP32_OFFBIG
# include/gnu/stubs-32.h
# include/sys/vm86.h
# -64bit installs:
# include/gnu/stubs-64.h
cp -av $dummydir/lib/* $root/$multilib/
cp -av $dummydir/usr/lib/* $root/usr/$multilib/
cp -av $bindir/lddlibc4 $root/usr/bin/
mkdir -vp $root/usr/include/{gnu,sys}
cp -av $includedir/gnu/stubs-32.h $root/usr/include/gnu/
cp -av $includedir/sys/vm86.h $root/usr/include/sys/
fi
fi
if [ $stagelevel -eq 1 -a -f $confdir/glibc$pkg_glibc_version/no_path_in_glibcso.diff ]
then
var_append patchfiles " " $confdir/glibc$pkg_glibc_version/no_path_in_glibcso.diff
fi
}

+ 1
- 1
package/base/glibc/glibc.desc

@ -41,7 +41,7 @@
[L] GPL
[S] Stable
[P] X 01---5---9 100.500
[P] X 01-3-----9 100.400
#if xpkg == glibc22.*
[V] 2.2.5

+ 1
- 1
package/base/glibc/glibc26/RTLD_SINGLE_THREAD_P.patch

@ -1,7 +1,7 @@
copied from http://www.nabble.com/-PATCH--Define-RTLD_SINGLE_THREAD_P-on-ARM-tf3814888.html
--- glibc-2.6/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-07-03 11:03:16.000000000 +0200
+++ glibc-2.6/glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-07-03 11:04:30.000000000 +0200
+++ glibc-2.6/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-07-03 11:04:30.000000000 +0200
@@ -126,3 +126,9 @@
# define NO_CANCELLATION 1

+ 12
- 0
package/base/glibc/glibc26/___ll_lock_wait.patch

@ -0,0 +1,12 @@
--- ./nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h.orig 2007-08-27 01:14:28.000000000 +0200
+++ ./nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 2007-08-27 01:14:38.000000000 +0200
@@ -444,8 +444,7 @@
#define LLL_LOCK_INITIALIZER_LOCKED (1)
-extern int __lll_lock_wait (int val, int *__futex)
- __attribute ((regparm (2))) attribute_hidden;
+extern void __lll_lock_wait (int *__futex);
extern int __lll_unlock_wake (int *__futex)
__attribute ((regparm (1))) attribute_hidden;
extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;

+ 0
- 10
package/base/glibc/glibc26/fixup-cross-libc-so.patch

@ -1,10 +0,0 @@
--- ./Makerules 2007-06-28 16:51:02.000000000 +0200
+++ ./Makerules 2007-06-28 16:55:36.000000000 +0200
@@ -993,6 +993,7 @@
' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
) > $@.new
mv -f $@.new $@
+ [ -z "$$ROCK_FIXUP_CROSS_LIBC_SO" ] || $$ROCK_FIXUP_CROSS_LIBC_SO
endif

+ 0
- 37
package/base/glibc/glibc26/gcc_eh.patch.cross

@ -1,37 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/glibc/glibc23/gcc_eh.patch.cross
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -ruN glibc-2.3.4/Makeconfig glibc-2.3.4-new/Makeconfig
--- glibc-2.3.4/Makeconfig 2004-12-15 19:51:47.000000000 +0100
+++ glibc-2.3.4-new/Makeconfig 2005-03-27 15:47:19.000000000 +0200
@@ -514,12 +514,12 @@
libunwind = -lunwind
endif
ifneq ($(have-as-needed),yes)
- libgcc_eh := -lgcc_eh $(libunwind)
+ libgcc_eh := $(libunwind)
else
libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
endif
gnulib := -lgcc $(libgcc_eh)
-static-gnulib := -lgcc -lgcc_eh $(libunwind)
+static-gnulib := -lgcc $(libunwind)
libc.so-gnulib := -lgcc
endif
ifeq ($(elf),yes)

+ 441
- 0
package/base/glibc/glibc26/glibc-2.6-cross_hacks-1.patch.diff

@ -0,0 +1,441 @@
Copied from www.linuxfromscratch.org to ROCK Linux.
Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
Date: 2006-11-26
Initial Package Version: 2.5
Rediffed against 2.6 by Joe Ciccone
Origin: Joe Ciccone
Upstream Status: Unknown
Description: Adds native compile support to the build system then uses that
support to build zic-native, for installing timezone info,
rpcgen-native, for building librpcsvc.a, and localedef-native,
for creating the locale-archive.
diff -Naur glibc-2.6.orig/iconv/Makefile glibc-2.6/iconv/Makefile
--- glibc-2.6.orig/iconv/Makefile 2007-07-02 15:20:36.000000000 -0400
+++ glibc-2.6/iconv/Makefile 2007-07-02 15:28:24.000000000 -0400
@@ -56,6 +56,9 @@
iconvconfig.h
others = iconv_prog iconvconfig
+ifneq ($(cross-compiling),no)
+others-native = iconvconfig-native
+endif
install-others = $(inst_bindir)/iconv
install-sbin = iconvconfig
@@ -78,6 +81,7 @@
$(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
$(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
+$(objpfx)iconvconfig-native: $(iconvconfig-modules:%=$(objpfx)%-native.o)
ifneq ($(cross-compiling),yes)
xtests: test-iconvconfig
diff -Naur glibc-2.6.orig/iconvdata/Makefile glibc-2.6/iconvdata/Makefile
--- glibc-2.6.orig/iconvdata/Makefile 2007-07-02 15:20:35.000000000 -0400
+++ glibc-2.6/iconvdata/Makefile 2007-07-02 15:28:24.000000000 -0400
@@ -312,23 +312,25 @@
headers: $(addprefix $(objpfx), $(generated-modules:=.h))
+ifeq ($(cross-compiling),no)
+iconvconfig-cmd = LC_ALL=C LANGUAGE=C \
+ $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
+ $(common-objpfx)iconv/iconvconfig
+else
+iconvconfig-cmd = LC_ALL=C LANGUAGE=C \
+ $(common-objpfx)iconv/iconvconfig-native
+endif
+
$(addprefix $(inst_gconvdir)/, $(modules.so)): \
$(inst_gconvdir)/%: $(objpfx)% $(+force)
$(do-install-program)
$(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
$(do-install)
-ifeq (no,$(cross-compiling))
# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
# if this libc has more gconv modules than the previously installed one.
if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
- LC_ALL=C LANGUAGE=C \
- $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
- $(common-objpfx)iconv/iconvconfig \
- $(addprefix --prefix=,$(install_root)); \
+ $(iconvconfig-cmd) $(addprefix --prefix=,$(install_root)); \
fi
-else
- @echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
-endif
endif # build-shared = yes
diff -Naur glibc-2.6.orig/include-native/bits/libc-tsd.h glibc-2.6/include-native/bits/libc-tsd.h
--- glibc-2.6.orig/include-native/bits/libc-tsd.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.6/include-native/bits/libc-tsd.h 2007-07-02 15:28:24.000000000 -0400
@@ -0,0 +1,3 @@
+#ifndef __libc_tsd_define
+#define __libc_tsd_define(A,B)
+#endif
diff -Naur glibc-2.6.orig/include-native/config.h glibc-2.6/include-native/config.h
--- glibc-2.6.orig/include-native/config.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.6/include-native/config.h 2007-07-02 15:28:24.000000000 -0400
@@ -0,0 +1 @@
+/* Empty */
diff -Naur glibc-2.6.orig/include-native/gnu/stubs.h glibc-2.6/include-native/gnu/stubs.h
--- glibc-2.6.orig/include-native/gnu/stubs.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.6/include-native/gnu/stubs.h 2007-07-02 15:28:24.000000000 -0400
@@ -0,0 +1 @@
+/* Empty */
diff -Naur glibc-2.6.orig/include-native/intl/loadinfo.h glibc-2.6/include-native/intl/loadinfo.h
--- glibc-2.6.orig/include-native/intl/loadinfo.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.6/include-native/intl/loadinfo.h 2007-07-02 15:28:24.000000000 -0400
@@ -0,0 +1,4 @@
+#ifndef LOADINFO_H
+#define LOADINFO_H
+struct loaded_l10nfile;
+#endif
diff -Naur glibc-2.6.orig/include-native/libintl.h glibc-2.6/include-native/libintl.h
--- glibc-2.6.orig/include-native/libintl.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.6/include-native/libintl.h 2007-07-02 15:28:24.000000000 -0400
@@ -0,0 +1,13 @@
+#include_next <libintl.h>
+
+#ifndef _
+#define _(X) (X)
+#endif
+
+#ifndef N_
+#define N_(X) (X)
+#endif
+
+#ifndef _libc_intl_domainname
+#define _libc_intl_domainname "libc"
+#endif
diff -Naur glibc-2.6.orig/include-native/symbol-hacks.h glibc-2.6/include-native/symbol-hacks.h
--- glibc-2.6.orig/include-native/symbol-hacks.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.6/include-native/symbol-hacks.h 2007-07-02 15:28:24.000000000 -0400
@@ -0,0 +1 @@
+/* Empty */
diff -Naur glibc-2.6.orig/include-native/tls.h glibc-2.6/include-native/tls.h
--- glibc-2.6.orig/include-native/tls.h 1969-12-31 19:00:00.000000000 -0500
+++ glibc-2.6/include-native/tls.h 2007-07-02 15:28:24.000000000 -0400
@@ -0,0 +1,11 @@
+#ifndef _include_tls_h
+#define _include_tls_h 1
+
+#if USE_TLS && HAVE___THREAD \
+ && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+# define USE___THREAD 1
+#else
+# define USE___THREAD 0
+#endif
+
+#endif
diff -Naur glibc-2.6.orig/locale/Makefile glibc-2.6/locale/Makefile
--- glibc-2.6.orig/locale/Makefile 2007-07-02 15:20:37.000000000 -0400
+++ glibc-2.6/locale/Makefile 2007-07-02 15:28:24.000000000 -0400
@@ -44,6 +44,9 @@
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
xlocale localename global-locale coll-lookup
others = localedef locale
+ifneq ($(cross-compiling),no)
+others-native = localedef-native
+endif
#others-static = localedef locale
install-bin = localedef locale
extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \
@@ -81,6 +84,12 @@
$(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
$(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
+ifneq ($(cross-compiling),no)
+$(objpfx)localedef-native: $(localedef-modules:%=$(objpfx)%-native.o)
+$(objpfx)localedef-native: $(localedef-aux:%=$(objpfx)%-native.o)
+$(objpfx)localedef-native: $(lib-modules:%=$(objpfx)%-native.o)
+endif
+
C-translit.h: C-translit.h.in gen-translit.pl
$(PERL) gen-translit.pl < $< > $@.tmp
mv -f $@.tmp $@
diff -Naur glibc-2.6.orig/localedata/Makefile glibc-2.6/localedata/Makefile
--- glibc-2.6.orig/localedata/Makefile 2007-07-02 15:20:34.000000000 -0400
+++ glibc-2.6/localedata/Makefile 2007-07-02 15:28:24.000000000 -0400
@@ -206,8 +206,13 @@
INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
# Sometimes the whole collection of locale files should be installed.
+ifeq ($(cross-compiling),no)
LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
+else
+LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+$(common-objpfx)locale/localedef-native
+endif
install-locales: $(INSTALL-SUPPORTED-LOCALES)
install-locales-dir:
diff -Naur glibc-2.6.orig/Makeconfig glibc-2.6/Makeconfig
--- glibc-2.6.orig/Makeconfig 2007-07-02 15:20:36.000000000 -0400
+++ glibc-2.6/Makeconfig 2007-07-02 15:32:37.000000000 -0400
@@ -445,6 +445,13 @@
$(common-objpfx)libc% $(+postinit),$^) \
$(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit)
endif
+# Command for linking programs against the host system.
+ifndef +link-native
++link-native = $(BUILD_CC) -static -g -o $@ $^ \
+ $(LDFLAGS) $(LDFLAGS-$(@F)) \
+ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
+ $(link-extra-libs)
+endif
# Command for statically linking bounded-pointer programs with the C library.
ifndef +link-bounded
+link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \
@@ -658,6 +665,8 @@
$(+sysdep-includes) $(includes) \
$(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
++includes-native = -I$(..)include-native -I$(objpfx) -I.
+
# Since libio has several internal header files, we use a -I instead
# of many little headers in the include directory.
libio-include = -I$(..)libio
@@ -672,10 +681,15 @@
$(foreach lib,$(libof-$(basename $(@F))) \
$(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
$(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
+CPPFLAGS-native = -D_GNU_SOURCE $($(subdir)-CPPFLAGS) $(+includes-native) $(defines) \
+ $(CPPFLAGS-$(suffix $@)) -include $(..)include/libc-symbols.h \
+ $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
override CFLAGS = -std=gnu99 $(gnu89-inline-CFLAGS) \
$(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
$(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
$(CFLAGS-$(@F))
+override CFLAGS-native = -std=gnu99 $(default_cflags) $(+gccwarn-c) \
+ $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F))
override CXXFLAGS = $(c++-sysincludes) \
$(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \
$(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F))
diff -Naur glibc-2.6.orig/Makerules glibc-2.6/Makerules
--- glibc-2.6.orig/Makerules 2007-07-02 15:20:36.000000000 -0400
+++ glibc-2.6/Makerules 2007-07-02 15:28:24.000000000 -0400
@@ -292,6 +292,9 @@
object-suffixes-left := $(all-object-suffixes)
include $(o-iterator)
+$(objpfx)%-native.o: %.c $(before-compile)
+ $(native-compile-command.c)
+
# Omit the objpfx rules when building in the source tree, because
# objpfx is empty and so these rules just override the ones above.
ifdef objpfx
@@ -368,6 +371,8 @@
compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION) $(compile-mkdep-flags)
compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags)
compile-command.cc = $(compile.cc) $(OUTPUT_OPTION) $(compile-mkdep-flags)
+# Native commands
+native-compile-command.c = $(native-compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags)
# GCC can grok options after the file name, and it looks nicer that way.
compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS)
@@ -377,6 +382,8 @@
COMPILE.S = $(CC) -c $(CPPFLAGS) $(S-CPPFLAGS) \
$(ASFLAGS) $(ASFLAGS-$(suffix $@))
COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS)
+# Native commands
+native-compile.c = $(BUILD_CC) -g $< -c $(CFLAGS-native) $(CPPFLAGS-native)
# We need this for the output to go in the right place. It will default to
# empty if make was configured to work with a cc that can't grok -c and -o
@@ -1168,7 +1175,7 @@
$(make-target-directory)
$(patsubst %/,cd % &&,$(objpfx)) \
$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \
- $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F)
+ $(addprefix $(shell pwd)/, $^) -o $(@F)
endef
# Command to compile $< in $(common-objdir) using the native libraries.
diff -Naur glibc-2.6.orig/malloc/Makefile glibc-2.6/malloc/Makefile
--- glibc-2.6.orig/malloc/Makefile 2007-07-02 15:20:36.000000000 -0400
+++ glibc-2.6/malloc/Makefile 2007-07-02 15:28:24.000000000 -0400
@@ -73,10 +73,6 @@
endif
endif
-# Unless we get a test for the availability of libgd which also works
-# for cross-compiling we disable the memusagestat generation in this
-# situation.
-ifneq ($(cross-compiling),yes)
# If the gd library is available we build the `memusagestat' program.
ifneq ($(LIBGD),no)
others: $(objpfx)memusage
@@ -91,7 +87,6 @@
# is to presume that the standard system headers will be ok for this file.
$(objpfx)memusagestat.o: sysincludes = # nothing
endif
-endif
# Another goal which can be used to override the configure decision.
.PHONY: do-memusagestat
diff -Naur glibc-2.6.orig/Rules glibc-2.6/Rules
--- glibc-2.6.orig/Rules 2007-07-02 15:20:35.000000000 -0400
+++ glibc-2.6/Rules 2007-07-02 15:28:24.000000000 -0400
@@ -87,7 +87,7 @@
.PHONY: others tests
ifeq ($(build-programs),yes)
-others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs))
+others: $(addprefix $(objpfx),$(others) $(others-native) $(sysdep-others) $(extra-objs))
else
others: $(addprefix $(objpfx),$(extra-objs))
endif
@@ -106,9 +106,11 @@
ifeq ($(build-programs),yes)
binaries-all = $(others) $(sysdep-others) $(tests) $(xtests) $(test-srcs)
binaries-static = $(others-static) $(tests-static) $(xtests-static)
+binaries-native = $(others-native)
else
binaries-all = $(tests) $(xtests) $(test-srcs)
binaries-static =
+binaries-native =
endif
binaries-shared = $(filter-out $(binaries-static), $(binaries-all))
@@ -127,6 +129,11 @@
$(+link-static)
endif
+ifneq "$(strip $(binaries-native))" ""
+$(addprefix $(objpfx),$(binaries-native)): %: %.o
+ $(+link-native)
+endif
+
ifeq ($(build-bounded),yes)
binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs))
$(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \
diff -Naur glibc-2.6.orig/sunrpc/Makefile glibc-2.6/sunrpc/Makefile
--- glibc-2.6.orig/sunrpc/Makefile 2007-07-02 15:20:36.000000000 -0400
+++ glibc-2.6/sunrpc/Makefile 2007-07-02 15:28:24.000000000 -0400
@@ -70,6 +70,9 @@
clnt_unix svc_unix create_xid xdr_intXX_t
others := rpcinfo
+ifneq ($(cross-compiling),no)
+others-native := rpcgen-native
+endif
install-bin := rpcgen
install-sbin := rpcinfo
rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
@@ -98,15 +101,12 @@
$(resolvobjdir)/libresolv.a
endif
-ifeq (no,$(cross-compiling))
-# We can only build this library if we can run the rpcgen we build.
headers += $(rpcsvc:%.x=rpcsvc/%.h)
extra-libs := librpcsvc
extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass.
librpcsvc-routines = $(rpcsvc:%.x=x%)
librpcsvc-inhibit-o = .os # Build no shared rpcsvc library.
omit-deps = $(librpcsvc-routines)
-endif
CFLAGS-xbootparam_prot.c = -Wno-unused $(PIC-ccflag)
CFLAGS-xnlm_prot.c = -Wno-unused $(PIC-ccflag)
@@ -136,13 +136,26 @@
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
$(+link)
+ifneq ($(cross-compiling),no)
+rpcgen.c:
+ touch rpcgen.c
+
+$(objpfx)rpcgen-native: $(addprefix $(objpfx),$(rpcgen-objs:%.o=%-native.o))
+endif
+
# This makes sure -DNOT_IN_libc is passed for all these modules.
cpp-srcs-left := $(rpcgen-objs:.o=.c)
lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
# Tell rpcgen where to find the C preprocessor.
+ifeq ($(cross-compiling),no)
rpcgen-cmd = CPP='$(CC) -E -x c-header' $(built-program-cmd) -Y ../scripts
+rpcgen = $(objpfx)rpcgen
+else
+rpcgen-cmd = CPP='$(CC) -E -x c-header' $(objpfx)rpcgen-native -Y ../scripts
+rpcgen = $(objpfx)rpcgen-native
+endif
# Install the rpc data base file.
$(inst_sysconfdir)/rpc: etc.rpc $(+force)
@@ -153,7 +166,7 @@
# relinked.
$(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp
@:
-$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)rpcgen
+$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(rpcgen)
$(make-target-directory)
-@rm -f ${@:stmp=T} $@
$(rpcgen-cmd) -h $< -o ${@:stmp=T}
@@ -163,7 +176,7 @@
# Generate the rpcsvc XDR functions with rpcgen.
$(rpcsvc:%.x=$(objpfx)x%.c): $(objpfx)x%.c: $(objpfx)x%.stmp
@:
-$(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)rpcgen
+$(objpfx)x%.stmp: rpcsvc/%.x $(rpcgen)
-@rm -f ${@:stmp=T} $@
$(rpcgen-cmd) -c $< -o ${@:stmp=T}
$(move-if-change) $(@:stmp=T) $(@:stmp=c)
diff -Naur glibc-2.6.orig/timezone/Makefile glibc-2.6/timezone/Makefile
--- glibc-2.6.orig/timezone/Makefile 2007-07-02 15:20:36.000000000 -0400
+++ glibc-2.6/timezone/Makefile 2007-07-02 15:28:24.000000000 -0400
@@ -28,6 +28,9 @@
extra-objs := scheck.o ialloc.o
others := zdump zic
+ifneq ($(cross-compiling),no)
+others-native := zic-native
+endif
tests := test-tz tst-timezone
tzbases := africa antarctica asia australasia europe northamerica \
@@ -69,13 +72,10 @@
$(addprefix $(inst_zonedir)/, \
$(posixrules-file)))
-ifeq ($(cross-compiling),no)
-# Don't try to install the zoneinfo files since we can't run zic.
install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
$(zonenames:%=posix/%) \
$(zonenames:%=right/%)) \
$(installed-localtime-file) $(installed-posixrules-file)
-endif
ifeq ($(have-ksh),yes)
install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
@@ -128,7 +128,11 @@
# We have to use `-d $(inst_zonedir)' to explictly tell zic where to
# place the output files although $(zonedir) is compiled in. But the
# user might have set $(install_root) on the command line of `make install'.
+ifeq ($(cross-compiling),no)
zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
+else
+zic-cmd = $(common-objpfx)/timezone/zic-native -d $(inst_zonedir)
+endif
tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
-y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
@@ -158,8 +162,10 @@
$(zic-cmd) -p $(posixrules)
endif
-
$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
+ifneq ($(cross-compiling),no)
+$(objpfx)zic-native: $(objpfx)scheck-native.o $(objpfx)ialloc-native.o
+endif
tz-cflags = -DTZDIR='"$(zonedir)"' \
-DTZDEFAULT='"$(localtime-file)"' \

+ 127
- 0
package/base/glibc/glibc26/glibc-2.6-libgcc_eh-1.patch.cross

@ -0,0 +1,127 @@
Copied from www.linuxfromscratch.org to ROCK Linux.
Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
Date: 2006-11-09
Initial Package Version: 2.5
Origin: Joe Ciccone
Upstream Status: Unknown
Description: Checks to see if libgcc_eh has been provided by gcc. If it has
the glibc will attempt to link to it.
diff -Naur glibc-2.6.orig/config.make.in glibc-2.6/config.make.in
--- glibc-2.6.orig/config.make.in 2007-06-23 21:26:46.000000000 -0400
+++ glibc-2.6/config.make.in 2007-06-23 21:27:16.000000000 -0400
@@ -59,6 +59,7 @@
have-libaudit = @have_libaudit@
have-libcap = @have_libcap@
have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
+have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
fno-unit-at-a-time = @fno_unit_at_a_time@
bind-now = @bindnow@
have-hash-style = @libc_cv_hashstyle@
diff -Naur glibc-2.6.orig/configure.in glibc-2.6/configure.in
--- glibc-2.6.orig/configure.in 2007-06-23 21:26:48.000000000 -0400
+++ glibc-2.6/configure.in 2007-06-23 21:27:16.000000000 -0400
@@ -1388,6 +1388,23 @@
AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
fi
+ AC_CACHE_CHECK(whether to link against libgcc_eh,
+ libc_cv_cc_with_libgcc_eh, [
+ cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
+ conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
+ libc_cv_cc_with_libgcc_eh=yes
+ else
+ libc_cv_cc_with_libgcc_eh=no
+ fi
+ rm -f conftest*])
+ AC_SUBST(libc_cv_cc_with_libgcc_eh)
+ if test $libc_cv_cc_with_libgcc_eh = yes; then
+ AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
+ fi
+
AC_CACHE_CHECK(for -z nodelete option,
libc_cv_z_nodelete, [dnl
cat > conftest.c <<EOF
diff -Naur glibc-2.6.orig/Makeconfig glibc-2.6/Makeconfig
--- glibc-2.6.orig/Makeconfig 2007-06-23 21:26:49.000000000 -0400
+++ glibc-2.6/Makeconfig 2007-06-23 21:27:16.000000000 -0400
@@ -524,12 +524,20 @@
libunwind = -lunwind
endif
ifneq ($(have-as-needed),yes)
+ifneq ($(have-cc-with-libgcc_eh),yes)
+ libgcc_eh := $(libunwind)
+else
libgcc_eh := -lgcc_eh $(libunwind)
+endif
else
libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
endif
gnulib := -lgcc $(libgcc_eh)
-static-gnulib := -lgcc -lgcc_eh $(libunwind)
+ifneq ($(have-cc-with-libgcc_eh),yes)
+ static-gnulib := -lgcc $(libunwind)
+else
+ static-gnulib := -lgcc -lgcc_eh $(libunwind)
+endif
libc.so-gnulib := -lgcc
endif
ifeq ($(elf),yes)
diff -Naur glibc-2.6.orig/configure glibc-2.6/configure
--- glibc-2.6.orig/configure 2007-06-23 21:26:49.000000000 -0400
+++ glibc-2.6/configure 2007-06-23 21:29:47.000000000 -0400
@@ -313,7 +313,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_cc_with_libgcc_eh libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -5542,6 +5542,33 @@
fi
+ { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
+echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
+if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
+ conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
+ libc_cv_cc_with_libgcc_eh=yes
+ else
+ libc_cv_cc_with_libgcc_eh=no
+ fi
+ rm -f conftest*
+fi
+{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
+echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; }
+
+ if test $libc_cv_cc_with_libgcc_eh = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_CC_WITH_LIBGCC_EH 1
+_ACEOF
+
+ fi
+
echo "$as_me:$LINENO: checking for -z nodelete option" >&5
echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6
if test "${libc_cv_z_nodelete+set}" = set; then
@@ -8543,6 +8570,7 @@
s,@BISON@,$BISON,;t t
s,@VERSIONING@,$VERSIONING,;t t
s,@libc_cv_cc_with_libunwind@,$libc_cv_cc_with_libunwind,;t t
+s,@libc_cv_cc_with_libgcc_eh@,$libc_cv_cc_with_libgcc_eh,;t t
s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t
s,@libc_cv_libgcc_s_suffix@,$libc_cv_libgcc_s_suffix,;t t
s,@libc_cv_as_needed@,$libc_cv_as_needed,;t t

+ 58
- 0
package/base/glibc/glibc26/glibc-2.6-localedef_segfault-1.patch

@ -0,0 +1,58 @@
Copied from www.linuxfromscratch.org to ROCK Linux.
Submitted By: Jim Gifford (patches at jg555 dot com)
Date: 2007-05-19
Initial Package Version: 2.6
Origin: Debian
Upstream Status: Unknown
Description: Fixes Segfault when using localdef.
This problem is only noticed when using PaX
and some architectures besides x86.
See debian bug # 231438
diff -Naur glibc-2.6.orig/locale/programs/3level.h glibc-2.6/locale/programs/3level.h
--- glibc-2.6.orig/locale/programs/3level.h 2005-12-06 21:47:27.000000000 -0800
+++ glibc-2.6/locale/programs/3level.h 2007-05-19 13:38:01.000000000 -0700
@@ -202,6 +202,42 @@
}
}
}
+
+/* GCC ATM seems to do a poor job with pointers to nested functions passed
+ to inlined functions. Help it a little bit with this hack. */
+#define wchead_table_iterate(tp, fn) \
+do \
+ { \
+ struct wchead_table *t = (tp); \
+ uint32_t index1; \
+ for (index1 = 0; index1 < t->level1_size; index1++) \
+ { \
+ uint32_t lookup1 = t->level1[index1]; \
+ if (lookup1 != ((uint32_t) ~0)) \
+ { \
+ uint32_t lookup1_shifted = lookup1 << t->q; \
+ uint32_t index2; \
+ for (index2 = 0; index2 < (1 << t->q); index2++) \
+ { \
+ uint32_t lookup2 = t->level2[index2 + lookup1_shifted]; \
+ if (lookup2 != ((uint32_t) ~0)) \
+ { \
+ uint32_t lookup2_shifted = lookup2 << t->p; \
+ uint32_t index3; \
+ for (index3 = 0; index3 < (1 << t->p); index3++) \
+ { \
+ struct element_t *lookup3 \
+ = t->level3[index3 + lookup2_shifted]; \
+ if (lookup3 != NULL) \
+ fn ((((index1 << t->q) + index2) << t->p) + index3, \
+ lookup3); \
+ } \
+ } \
+ } \
+ } \
+ } \
+ } while (0)
+
#endif
#ifndef NO_FINALIZE

+ 2
- 2
package/base/glibc/glibc26/semaphore_h.patch.arm

@ -3,8 +3,8 @@ RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/semaphore.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ./glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/bits/semaphore.h 2005/11/16 19:03:42 1.1
+++ ./glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/bits/semaphore.h 2007/07/10 13:35:29 1.2
--- ./ports/sysdeps/unix/sysv/linux/arm/nptl/bits/semaphore.h 2005/11/16 19:03:42 1.1
+++ ./ports/sysdeps/unix/sysv/linux/arm/nptl/bits/semaphore.h 2007/07/10 13:35:29 1.2
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.

+ 4
- 0
package/base/glibc/glibc26/zrelrocheck.patch

@ -1,3 +1,7 @@
Glibc checks if the linker supports the -z relro option by reading the output
of '$CC -v --help', but at least with native builds in stage 3, only
'$CC -v --target-help' would give the needed output.
--- ./configure.orig 2007-05-18 04:07:18.000000000 +0200
+++ ./configure 2007-05-31 00:09:59.000000000 +0200
@@ -5631,6 +5631,7 @@

+ 29
- 0
package/base/glibc/ld.so.conf

@ -0,0 +1,29 @@
#
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/base/glibc/nsswitch.conf
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# 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; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
#
# Example configuration of the GLibc dynamic linker.
#
/usr/X11/lib
/usr/local/lib
/opt/*/lib

+ 1
- 0
package/base/glibc/postconfig.in

@ -0,0 +1 @@
pkgremove glibc

Loading…
Cancel
Save