Browse Source

Fixed how glibc unpacks libidn, ports and linuxthreads

early
Alejandro Mery 18 years ago
parent
commit
be9a050346
  1. 32
      base/glibc/glibc.conf

32
base/glibc/glibc.conf

@ -86,30 +86,20 @@ var_append makeinstopt " " "slibdir=/\$slibdir install_root=\$root"
glibc_prepatch() { glibc_prepatch() {
local tarball= tarname= local tarball= tarname=
for tarball in `match_source_file -p ports` \ local addon= addons="ports"
`match_source_file -p libidn` \
`match_source_file -p linuxthread` [ "$SDECFG_PKG_GLIBC_LIBIDN" != '1' ] || var_append addons ' ' 'libidn'
do [ "$SDECFG_PKG_GLIBC_TLS" = 1 ] || var_append addons ' ' 'linuxthreads'
for addon in $addons; do
tarball=$( match_source_file -p $addon )
tarname=${tarball##*/}; tarname=${tarname%.tar.*} tarname=${tarball##*/}; tarname=${tarname%.tar.*}
# do not overwrite the configure script and such # extract each addon into the definitive folder
case "$tarball" in mkdir -pv $addon
*ports*) ln -sv $addon $tarname
ln -sv . $tarname
tar -v ${taropt} $tarball ${tarname}/sysdeps
;;
*libidn*)
mkdir -pv libidn
ln -sv libidn $tarname
tar -v ${taropt} $tarball tar -v ${taropt} $tarball
;; rm $tarname
*)
tar -v ${taropt} $tarball linuxthreads
;;
esac
# remove CVS from the newly extracted files, glibc tries to
# automatically commit newly generated files :-!
find -name CVS | xargs rm -rfv
done done
mkdir -p $root$includedir/gnu/ mkdir -p $root$includedir/gnu/

Loading…
Cancel
Save